Skip to content

Commit 2ccd89e

Browse files
committed
Fix build.sh cargo build loop and xcframework module.modulemap
1 parent 38403e0 commit 2ccd89e

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Package.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ let package = Package(
2525
.binaryTarget(
2626
name: "bdkFFI",
2727
url: "https://github.com/notmandatory/bdk-swift/releases/download/0.1.0/bdkFFI.xcframework.zip",
28-
checksum: "b34dc1dea2e53bc894f1ad61269e45de6c77dd6391bbb1318cfb0be17435c4db"),
28+
checksum: "496423e55dd5db14cb2b692f59ae6bf527431c59f79ab51d89c83f68e23d4722"),
29+
// .binaryTarget(name: "bdkFFI", path: "./bdkFFI.xcframework"),
2930
.target(
3031
name: "BitcoinDevKit",
3132
dependencies: ["bdkFFI"]),

build.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
set -eo pipefail
2+
set -euo pipefail
33

44
BUILD_PROFILE=release
55
BDKFFI_DIR=bdk-ffi
@@ -22,11 +22,13 @@ swiftc -module-name bdk -emit-library -o libbdkffi.dylib -emit-module -emit-modu
2222
## build bdk-ffi rust libs into xcframework
2323
echo "Build bdk-ffi libs into swift xcframework"
2424

25-
APPLE_TRIPLES=("x86_64-apple-darwin" "x86_64-apple-ios" "aarch64-apple-ios")
26-
for TARGET in $APPLE_TRIPLES; do
25+
TARGET_TRIPLES=("x86_64-apple-darwin" "x86_64-apple-ios" "aarch64-apple-ios")
26+
for TARGET in ${TARGET_TRIPLES[@]}; do
2727
echo "Build bdk-ffi lib for target $TARGET"
2828
cargo build --release --target $TARGET
29+
echo $?
2930
done
31+
3032
popd
3133

3234
## Manually construct xcframework
@@ -37,7 +39,7 @@ rm -f $XCFRAMEWORK_ROOT.zip
3739

3840
# Common files
3941
mkdir -p "$XCFRAMEWORK_COMMON/Modules"
40-
cp "$SWIFT_DIR/$XCFRAMEWORK_NAME.modulemap" "$XCFRAMEWORK_COMMON/Modules/"
42+
cp "$SWIFT_DIR/module.modulemap" "$XCFRAMEWORK_COMMON/Modules/"
4143
mkdir -p "$XCFRAMEWORK_COMMON/Headers"
4244
cp "$SWIFT_DIR/$XCFRAMEWORK_NAME-umbrella.h" "$XCFRAMEWORK_COMMON/Headers"
4345
cp "$SWIFT_DIR/$XCFRAMEWORK_NAME.h" "$XCFRAMEWORK_COMMON/Headers"

0 commit comments

Comments
 (0)