Skip to content

Commit 4cae1b5

Browse files
committed
move viaduct header to ios and fix copying focus swift files
1 parent b6d82c3 commit 4cae1b5

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

megazords/ios-rust/build-xcframework.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ UNIFFI_BINDGEN_LIBRARY="$TARGET_DIR/aarch64-apple-ios/$BUILD_PROFILE/$LIB_NAME"
149149

150150
# First move the non-generated headers (these are all common between both firefox-ios and Focus)
151151
cp "$WORKING_DIR/$FRAMEWORK_NAME.h" "$COMMON/Headers"
152-
cp "$REPO_ROOT/components/viaduct/ios/RustViaductFFI.h" "$COMMON/Headers"
152+
cp "$THIS_DIR/Sources/MozillaRustComponentsWrapper/Viaduct/RustViaductFFI.h" "$COMMON/Headers"
153153

154154
# Next, generate files with uniffi-bindgen (forward --generate-swift-sources if present)
155155
# You generally want to generate the swift sources if you want to see/test the generated uniffi code

megazords/ios-rust/generate-files.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if [[ "$BUILD_SOURCES" == true ]]; then
5454
fi
5555

5656
# Hack to copy in the RustViaductFFI.h (https://bugzilla.mozilla.org/show_bug.cgi?id=1925601)
57-
cp "$THIS_DIR/../../components/viaduct/ios/RustViaductFFI.h" "$COMMON/Headers"
57+
cp "$THIS_DIR/Sources/MozillaRustComponentsWrapper/Viaduct/RustViaductFFI.h" "$COMMON/Headers"
5858
echo "original modulemap"
5959
cat "$COMMON/Modules/module.modulemap"
6060
TWEAKED_MODULEMAP=$(cat <(head -n1 "$COMMON/Modules/module.modulemap") <(echo " header \"RustViaductFFI.h\"") <(tail -n +2 "$COMMON/Modules/module.modulemap"))

taskcluster/scripts/build-and-test-swift.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
WRAPPER_DIR / "Viaduct",
2525
]
2626

27-
# List of udl_paths to generate bindings for
2827
FOCUS_SOURCE_TO_COPY = [
29-
"components/nimbus/ios/Nimbus",
30-
"components/viaduct/ios/*",
28+
WRAPPER_DIR / "Nimbus",
29+
WRAPPER_DIR / "Viaduct",
3130
]
3231

3332

0 commit comments

Comments
 (0)