SDK build improvements for iOS

afilini · Oct 23, 2024 · 3cfb0ae · 3cfb0ae
1 parent 66493ad
commit 3cfb0ae
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 33 deletions.
diff --git a/sdk/libportal-ios/build-local-swift.sh b/sdk/libportal-ios/build-local-swift.sh
@@ -28,13 +28,22 @@ lipo ../target/aarch64-apple-ios-sim/release/libportal.a ../target/x86_64-apple-
 
 popd
 
+rm -rf ./portalFFI.xcframework
+rm -rf ../../target/include
+
+mkdir -pv ../../target/include
+cp Sources/LibPortal/portalFFI.h ../../target/include/
+cp Sources/LibPortal/portalFFI.modulemap ../../target/include/module.modulemap
+
+# create new xcframework directory from bdk-ffi static libs and headers
+xcodebuild -create-xcframework \
+    -library "../../target/aarch64-apple-ios/release/libportal.a" \
+    -headers "../../target/include" \
+    -library "../../target/lipo-ios-sim/release/libportal.a" \
+    -headers "../../target/include" \
+    -output "./portalFFI.xcframework"
+
 mv Sources/LibPortal/portal.swift Sources/LibPortal/LibPortal.swift
-cp Sources/LibPortal/portalFFI.h portalFFI.xcframework/ios-arm64/portalFFI.framework/Headers
-cp Sources/LibPortal/portalFFI.h portalFFI.xcframework/ios-arm64_x86_64-simulator/portalFFI.framework/Headers
-cp ../../target/aarch64-apple-ios/release/libportal.a portalFFI.xcframework/ios-arm64/portalFFI.framework/portalFFI
-cp ../../target/lipo-ios-sim/release/libportal.a portalFFI.xcframework/ios-arm64_x86_64-simulator/portalFFI.framework/portalFFI
-rm Sources/LibPortal/portalFFI.h
-rm Sources/LibPortal/portalFFI.modulemap
 
 PACKAGE=${PACKAGE-'0'}
 if [ "$PACKAGE" -eq '1' ]; then

diff --git a/sdk/libportal-ios/portalFFI.xcframework/Info.plist b/sdk/libportal-ios/portalFFI.xcframework/Info.plist
@@ -5,31 +5,39 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libportal.a</string>
+			<key>HeadersPath</key>
+			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
-			<string>portalFFI.framework</string>
+			<string>libportal.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libportal.a</string>
+			<key>HeadersPath</key>
+			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
-			<string>portalFFI.framework</string>
+			<string>libportal.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/...rtal-ios/portalFFI.xcframework/ios-arm64/portalFFI.framework/Headers/portalFFI-umbrella.h b/...rtal-ios/portalFFI.xcframework/ios-arm64/portalFFI.framework/Headers/portalFFI-umbrella.h
diff --git a/...ibportal-ios/portalFFI.xcframework/ios-arm64/portalFFI.framework/Modules/module.modulemap b/...ibportal-ios/portalFFI.xcframework/ios-arm64/portalFFI.framework/Modules/module.modulemap
diff --git a/...I.xcframework/ios-arm64_x86_64-simulator/portalFFI.framework/Headers/portalFFI-umbrella.h b/...I.xcframework/ios-arm64_x86_64-simulator/portalFFI.framework/Headers/portalFFI-umbrella.h
diff --git a/...alFFI.xcframework/ios-arm64_x86_64-simulator/portalFFI.framework/Modules/module.modulemap b/...alFFI.xcframework/ios-arm64_x86_64-simulator/portalFFI.framework/Modules/module.modulemap