Page MenuHomePhabricator
Differential D4807

[services] Tunnelbroker - Update CMakeLists and Cargo build with the CXX integration updates
ClosedPublic
Actions

Authored by • max on Aug 11 2022, 4:15 AM.
Tags
None
Referenced Files
F2131675: D4807.diff
Thu, Jun 27, 6:58 PM
F2125096: D4807.id.diff
Thu, Jun 27, 12:22 AM
Unknown Object (File)
Wed, Jun 26, 5:09 AM
Unknown Object (File)
Wed, Jun 26, 12:56 AM
Unknown Object (File)
Wed, Jun 26, 12:01 AM
Unknown Object (File)
Wed, Jun 19, 7:03 PM
Unknown Object (File)
Wed, Jun 19, 5:32 AM
Unknown Object (File)
Mon, Jun 17, 4:16 PM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
• karol
tomek

Details

Reviewers
• karol
varun
• jon
tomek
Commits
rCOMM13f2e1f40883: [services] Tunnelbroker - Update CMakeLists and Cargo build with the CXX…
Summary

This diff updates CMakeLists file to use corrosion-cxx.cmake from D4805 and it's function add_library_rust to use Corrosion and CXX to build and link Rust library to the C++ app. To use CXX bridge the build.rs file was also added.

Related Linear task: ENG-1438

Test Plan

Building in Docker:
Run yarn run-tunnelbroker-service successfully built the app, rust library, and link it to the app.

Building in Nix:
Run nix develop, cd services/tunnelbroker, rm -dfr build && cmake -B build . && make -C build -j4, successfully built the app, rust library, and link it to the app.

Diff Detail

Repository
rCOMM Comm
Branch
update-tunnelbroker-cmake-with-cxx
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• max created this revision.Aug 11 2022, 4:15 AM
• max held this revision as a draft.
Herald added subscribers: • abosh, • karol, atul and 3 others. · View Herald TranscriptAug 11 2022, 4:15 AM
• max added parent revisions: D4803: [services] Tunnelbroker - Update Cargo dependencies with the CXX, D4804: [services] Tunnelbroker - Update Cargo dependencies with the Log crate, D4805: [services] Add CMake file with functions for Corrosion and CXX integration, D4540: [services] Tunnelbroker - Rust APNS push notifications A2 library wrapper.Aug 11 2022, 4:16 AM
Harbormaster failed remote builds in B11299: Diff 15548!Aug 11 2022, 4:17 AM
• max mentioned this in D4805: [services] Add CMake file with functions for Corrosion and CXX integration.Aug 11 2022, 4:36 AM
• max updated this revision to Diff 15549.Aug 11 2022, 4:42 AM

Changes in include path.

Harbormaster failed remote builds in B11300: Diff 15549!Aug 11 2022, 4:43 AM
• max updated this revision to Diff 15550.Aug 11 2022, 8:08 AM

Add distinguish between Nix and Docker path for cmake-components.

Harbormaster failed remote builds in B11301: Diff 15550!Aug 11 2022, 8:10 AM
• max updated this revision to Diff 15592.Aug 12 2022, 12:16 AM

Rebasing on a parent changes.

Harbormaster failed remote builds in B11332: Diff 15592!Aug 12 2022, 12:16 AM
• max edited the summary of this revision. (Show Details)Aug 12 2022, 12:26 AM
• max edited the test plan for this revision. (Show Details)
• max added reviewers: • karol, varun, • jon, tomek.
• max edited the summary of this revision. (Show Details)
• max edited the summary of this revision. (Show Details)
• max published this revision for review.Aug 12 2022, 12:30 AM
• max mentioned this in D4540: [services] Tunnelbroker - Rust APNS push notifications A2 library wrapper.Aug 12 2022, 12:59 AM
• max updated this revision to Diff 15595.Aug 12 2022, 1:13 AM

Rebase on parent changes.

Harbormaster failed remote builds in B11335: Diff 15595!Aug 12 2022, 1:14 AM
• jon requested changes to this revision.Aug 12 2022, 9:53 AM
• jon added inline comments.
services/tunnelbroker/rust-notifications/build.rs
2

To force clang to use a more recent C++ standard

This revision now requires changes to proceed.Aug 12 2022, 9:53 AM
• max planned changes to this revision.Aug 15 2022, 7:44 AM
• max updated this revision to Diff 15737.Aug 18 2022, 8:20 AM

Add flag_if_supported("-std=c++17") and rebased on a changes.

• max marked an inline comment as done.Aug 18 2022, 8:20 AM
• max added inline comments.
services/tunnelbroker/rust-notifications/build.rs
2

To force clang to use a more recent C++ standard

Good catch. Done.

• max removed parent revisions: D4804: [services] Tunnelbroker - Update Cargo dependencies with the Log crate, D4803: [services] Tunnelbroker - Update Cargo dependencies with the CXX.Aug 18 2022, 8:21 AM
Harbormaster failed remote builds in B11442: Diff 15737!Aug 18 2022, 8:25 AM
• max planned changes to this revision.Aug 18 2022, 8:27 AM
• max marked an inline comment as done.
• max updated this revision to Diff 15789.Aug 19 2022, 3:24 AM

Rebased on parent D4805 changes.

Harbormaster completed remote builds in B11478: Diff 15789.Aug 19 2022, 3:33 AM
• max mentioned this in D4894: [services] Tunnelbroker - Rust FCM push notifications library wrapper.Aug 22 2022, 4:57 AM
• max updated this revision to Diff 15810.Aug 22 2022, 5:11 AM

Rebase on the parent changes.

• max added parent revisions: D4894: [services] Tunnelbroker - Rust FCM push notifications library wrapper, D4893: [services] Tunnelbroker - Add FCM crate to Cargo dependencies.Aug 22 2022, 5:12 AM
Harbormaster completed remote builds in B11496: Diff 15810.Aug 22 2022, 5:21 AM
• jon accepted this revision.Aug 22 2022, 9:56 AM
tomek accepted this revision.Aug 23 2022, 7:30 AM
This revision is now accepted and ready to land.Aug 23 2022, 7:30 AM
• max updated this revision to Diff 15929.Aug 24 2022, 7:29 AM

Rebase on parent changes and corrosion-cxx.cmake directory changes.

Harbormaster failed remote builds in B11587: Diff 15929!Aug 24 2022, 7:33 AM
• max added a comment.Aug 24 2022, 7:44 AM

Failure to build in a Docker will be fixed by copying the cxx-corrosion cmake file in a follow-up update of this diff.

• max mentioned this in D4949: [services] Tunnelbroker - Add copying of the shared directory to the Dockerfile.Aug 24 2022, 5:06 PM
• max removed a parent revision: D4893: [services] Tunnelbroker - Add FCM crate to Cargo dependencies.Aug 24 2022, 5:12 PM
• max updated this revision to Diff 15948.Aug 24 2022, 5:19 PM

Adding D4949 to the stack.

• max updated this revision to Diff 15949.Aug 24 2022, 5:21 PM

Fixing Folly.

• max added a parent revision: D4949: [services] Tunnelbroker - Add copying of the shared directory to the Dockerfile.Aug 24 2022, 5:21 PM
Harbormaster failed remote builds in B11600: Diff 15948!Aug 24 2022, 5:23 PM
Harbormaster failed remote builds in B11601: Diff 15949!Aug 24 2022, 5:26 PM
• max added a comment.Aug 24 2022, 5:28 PM

ESLint Failure is not related to these changes:

fetch-pack: unexpected disconnect while reading sideband packet
• max mentioned this in rCOMMd488b5bc4f82: [services] Add CMake file with functions for Corrosion and CXX integration.Aug 25 2022, 1:33 AM
• max mentioned this in rCOMM8af45cc98819: [services] Tunnelbroker - Add copying of the shared directory to the Dockerfile.Aug 29 2022, 5:47 AM
• max removed parent revisions: D4949: [services] Tunnelbroker - Add copying of the shared directory to the Dockerfile, D4805: [services] Add CMake file with functions for Corrosion and CXX integration.Aug 29 2022, 5:48 AM
• max updated this revision to Diff 16153.Aug 31 2022, 4:40 PM

Rebase on the parent changes.

Harbormaster completed remote builds in B11752: Diff 16153.Aug 31 2022, 4:50 PM
• max updated this revision to Diff 16213.Sep 1 2022, 10:05 AM

Rebased on parent changes.

Harbormaster completed remote builds in B11809: Diff 16213.Sep 1 2022, 10:15 AM
• max mentioned this in rCOMM4a74cf9cecb5: [services] Tunnelbroker - Rust APNS push notifications A2 library wrapper.Sep 6 2022, 4:59 AM
• max mentioned this in rCOMMec5b4c00245d: [services] Tunnelbroker - Rust FCM push notifications library wrapper.Sep 6 2022, 5:10 AM
• max updated this revision to Diff 16362.Sep 6 2022, 5:14 AM

Rebase and merge.

This revision was landed with ongoing or failed builds.Sep 6 2022, 5:21 AM
Closed by commit rCOMM13f2e1f40883: [services] Tunnelbroker - Update CMakeLists and Cargo build with the CXX… (authored by • max). · Explain Why
This revision was automatically updated to reflect the committed changes.
• max added a commit: rCOMM13f2e1f40883: [services] Tunnelbroker - Update CMakeLists and Cargo build with the CXX….
Harbormaster completed remote builds in B11917: Diff 16362.Sep 6 2022, 5:22 AM

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
8 lines
rust-notifications/
4 lines

Diff 15595

View Options

services/tunnelbroker/CMakeLists.txt

Loading...
View Options

services/tunnelbroker/rust-notifications/build.rs

Loading...