mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-08-19 02:51:47 +08:00
fix(ios): restore simulator Rust build outputs (#15190)
- sync the iOS ATT pod lockfile with the Capacitor plugin version already referenced by the repo - make `xc-universal-binary.sh` produce a real universal simulator Rust archive for `arm64` and `x86_64` - run `uniffi-bindgen` against a single-slice archive before assembling the fat simulator output - [x] `bash -n packages/frontend/apps/ios/App/xc-universal-binary.sh` - [x] `xcodebuild -workspace \"App.xcworkspace\" -scheme App -destination 'generic/platform=iOS Simulator' -derivedDataPath \".derivedData-rebuild\" build` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> * **Bug Fixes** * Improved the iOS build process so universal binaries are generated from consistent output locations, reducing build path issues. * Made device and simulator library handling more reliable during packaging and code generation, helping produce the expected app binaries more consistently. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
@@ -10,7 +10,7 @@ PODS:
|
|||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorKeyboard (7.0.4):
|
- CapacitorKeyboard (7.0.4):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorPluginAppTrackingTransparency (2.0.5):
|
- CapacitorPluginAppTrackingTransparency (3.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CryptoSwift (1.8.3)
|
- CryptoSwift (1.8.3)
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ SPEC CHECKSUMS:
|
|||||||
CapacitorCordova: 31bbe4466000c6b86d9b7f1181ee286cff0205aa
|
CapacitorCordova: 31bbe4466000c6b86d9b7f1181ee286cff0205aa
|
||||||
CapacitorHaptics: ce15be8f287fa2c61c7d2d9e958885b90cf0bebc
|
CapacitorHaptics: ce15be8f287fa2c61c7d2d9e958885b90cf0bebc
|
||||||
CapacitorKeyboard: 5660c760113bfa48962817a785879373cf5339c3
|
CapacitorKeyboard: 5660c760113bfa48962817a785879373cf5339c3
|
||||||
CapacitorPluginAppTrackingTransparency: 92ae9c1cfb5cf477753db9269689332a686f675a
|
CapacitorPluginAppTrackingTransparency: f0df8fe65d07d3854de3dad832caf192262bbaa5
|
||||||
CryptoSwift: 967f37cea5a3294d9cce358f78861652155be483
|
CryptoSwift: 967f37cea5a3294d9cce358f78861652155be483
|
||||||
|
|
||||||
PODFILE CHECKSUM: 2c1e4be82121f2d9724ecf7e31dd14e165aeb082
|
PODFILE CHECKSUM: 2c1e4be82121f2d9724ecf7e31dd14e165aeb082
|
||||||
|
|||||||
@@ -41,14 +41,16 @@ fi
|
|||||||
FFI_TARGET=${1}
|
FFI_TARGET=${1}
|
||||||
# path to source code root
|
# path to source code root
|
||||||
SRC_ROOT=${2}
|
SRC_ROOT=${2}
|
||||||
|
# Keep Cargo artifacts in a stable location that the rest of this script can reference.
|
||||||
|
export CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-$SRC_ROOT/../../../target}"
|
||||||
# buildvariant from our xcconfigs
|
# buildvariant from our xcconfigs
|
||||||
BUILDVARIANT=$(echo "${3}" | tr '[:upper:]' '[:lower:]')
|
BUILDVARIANT=$(echo "${3}" | tr '[:upper:]' '[:lower:]')
|
||||||
|
|
||||||
RELFLAG=
|
RELFLAG=debug
|
||||||
|
CARGO_PROFILE_FLAG=
|
||||||
if [[ "${BUILDVARIANT}" != "debug" ]]; then
|
if [[ "${BUILDVARIANT}" != "debug" ]]; then
|
||||||
RELFLAG=release
|
RELFLAG=release
|
||||||
else
|
CARGO_PROFILE_FLAG=--release
|
||||||
RELFLAG=debug
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
IS_SIMULATOR=0
|
IS_SIMULATOR=0
|
||||||
@@ -56,6 +58,11 @@ if [ "${LLVM_TARGET_TRIPLE_SUFFIX-}" = "-simulator" ]; then
|
|||||||
IS_SIMULATOR=1
|
IS_SIMULATOR=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
SIM_ARM64_LIB=
|
||||||
|
SIM_X86_64_LIB=
|
||||||
|
DEVICE_ARM64_LIB=
|
||||||
|
OUTPUT_LIB="$SRCROOT/lib${FFI_TARGET}.a"
|
||||||
|
|
||||||
for arch in $ARCHS; do
|
for arch in $ARCHS; do
|
||||||
case "$arch" in
|
case "$arch" in
|
||||||
x86_64)
|
x86_64)
|
||||||
@@ -66,20 +73,44 @@ for arch in $ARCHS; do
|
|||||||
|
|
||||||
# Intel iOS simulator
|
# Intel iOS simulator
|
||||||
export CFLAGS_x86_64_apple_ios="-target x86_64-apple-ios"
|
export CFLAGS_x86_64_apple_ios="-target x86_64-apple-ios"
|
||||||
$CARGO rustc -p "${FFI_TARGET}" --lib --crate-type staticlib --$RELFLAG --target x86_64-apple-ios --features use-as-lib
|
$CARGO rustc -p "${FFI_TARGET}" --lib --crate-type staticlib ${CARGO_PROFILE_FLAG:+$CARGO_PROFILE_FLAG} --target x86_64-apple-ios --features use-as-lib
|
||||||
|
SIM_X86_64_LIB="$CARGO_TARGET_DIR/x86_64-apple-ios/${RELFLAG}/lib${FFI_TARGET}.a"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
arm64)
|
arm64)
|
||||||
if [ $IS_SIMULATOR -eq 0 ]; then
|
if [ $IS_SIMULATOR -eq 0 ]; then
|
||||||
# Hardware iOS targets
|
# Hardware iOS targets
|
||||||
$CARGO rustc -p "${FFI_TARGET}" --lib --crate-type staticlib --$RELFLAG --target aarch64-apple-ios --features use-as-lib
|
$CARGO rustc -p "${FFI_TARGET}" --lib --crate-type staticlib ${CARGO_PROFILE_FLAG:+$CARGO_PROFILE_FLAG} --target aarch64-apple-ios --features use-as-lib
|
||||||
cp $SRC_ROOT/../../../target/aarch64-apple-ios/${RELFLAG}/lib${FFI_TARGET}.a $SRCROOT/lib${FFI_TARGET}.a
|
DEVICE_ARM64_LIB="$CARGO_TARGET_DIR/aarch64-apple-ios/${RELFLAG}/lib${FFI_TARGET}.a"
|
||||||
else
|
else
|
||||||
# M1 iOS simulator
|
# Apple Silicon iOS simulator
|
||||||
$CARGO rustc -p "${FFI_TARGET}" --lib --crate-type staticlib --$RELFLAG --target aarch64-apple-ios-sim --features use-as-lib
|
$CARGO rustc -p "${FFI_TARGET}" --lib --crate-type staticlib ${CARGO_PROFILE_FLAG:+$CARGO_PROFILE_FLAG} --target aarch64-apple-ios-sim --features use-as-lib
|
||||||
cp $SRC_ROOT/../../../target/aarch64-apple-ios-sim/${RELFLAG}/lib${FFI_TARGET}.a $SRCROOT/lib${FFI_TARGET}.a
|
SIM_ARM64_LIB="$CARGO_TARGET_DIR/aarch64-apple-ios-sim/${RELFLAG}/lib${FFI_TARGET}.a"
|
||||||
fi
|
fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
$CARGO run -p affine_mobile_native --features use-as-lib --bin uniffi-bindgen generate --library $SRCROOT/lib${FFI_TARGET}.a --language swift --out-dir $SRCROOT/../../ios/App/App/uniffi
|
BINDGEN_LIB=
|
||||||
|
if [ $IS_SIMULATOR -eq 0 ]; then
|
||||||
|
BINDGEN_LIB="$DEVICE_ARM64_LIB"
|
||||||
|
elif [ -n "$SIM_ARM64_LIB" ]; then
|
||||||
|
BINDGEN_LIB="$SIM_ARM64_LIB"
|
||||||
|
elif [ -n "$SIM_X86_64_LIB" ]; then
|
||||||
|
BINDGEN_LIB="$SIM_X86_64_LIB"
|
||||||
|
else
|
||||||
|
echo "error: no simulator Rust library was produced" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
$CARGO run -p affine_mobile_native --features use-as-lib --bin uniffi-bindgen generate --library "$BINDGEN_LIB" --language swift --out-dir $SRCROOT/../../ios/App/App/uniffi
|
||||||
|
|
||||||
|
if [ $IS_SIMULATOR -eq 0 ]; then
|
||||||
|
cp "$DEVICE_ARM64_LIB" "$OUTPUT_LIB"
|
||||||
|
elif [ -n "$SIM_ARM64_LIB" ] && [ -n "$SIM_X86_64_LIB" ]; then
|
||||||
|
lipo -create "$SIM_ARM64_LIB" "$SIM_X86_64_LIB" -output "$OUTPUT_LIB"
|
||||||
|
elif [ -n "$SIM_ARM64_LIB" ]; then
|
||||||
|
cp "$SIM_ARM64_LIB" "$OUTPUT_LIB"
|
||||||
|
else
|
||||||
|
cp "$SIM_X86_64_LIB" "$OUTPUT_LIB"
|
||||||
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user