Remove xcframework and just use static libraries

realm · Jan 5, 2024 · cf655b9 · cf655b9
1 parent 2c67a13
commit cf655b9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/packages/realm/RealmJS.podspec b/packages/realm/RealmJS.podspec
@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
 
   s.authors                = package['author']
   s.homepage               = package['homepage']
-  s.platform               = :ios, '9.0'
+  s.platform               = :ios, '13.4'
 
   # The source field is a required field in the podspec, but it is not ment to be used.
   # This is because the Podspec is not ment to be published into a CocoaPod repository, instead React Native uses a :path style dependency when adding this to the users projects Podfile.
@@ -71,8 +71,14 @@ Pod::Spec.new do |s|
                                 ].join(' ')
                               }
 
+  lib_location = "react-native/ios/build/libs"
+
   # TODO: Consider providing an option to build with the -dbg binaries instead
-  s.vendored_frameworks = 'react-native/ios/realm-js-ios.xcframework'
+  s.vendored_libraries = "#{lib_location}/librealm.a",
+                         "#{lib_location}/librealm-js-ios.a",
+                         "#{lib_location}/librealm-object-store.a",
+                         "#{lib_location}/librealm-parser.a",
+                         "#{lib_location}/librealm-sync.a"
 
   s.dependency 'React'
 

diff --git a/packages/realm/scripts/build-ios-on-install.sh b/packages/realm/scripts/build-ios-on-install.sh
@@ -68,25 +68,18 @@ else
 fi
 
 DESTINATIONS=()
-LIBRARIES=()
-BUILD_LIB_CMDS=()
 
+# TODO: Can this be infered from xcode env variables? (maccatalyst appears to be a unicorn)
 for platform in "${PLATFORMS[@]}"; do
     case "$platform" in
         ios)
             DESTINATIONS+=(-destination 'generic/platform=iOS')
-            LIBRARIES+=(-library ./out/$CONFIGURATION-iphoneos/librealm-js-ios.a -headers ./_include)
-            BUILD_LIB_CMDS+=("xcrun libtool -static -D -o ./out/$CONFIGURATION-iphoneos/librealm-js-ios.a ./out/$CONFIGURATION-iphoneos/*.a")
         ;;
         maccatalyst)
             DESTINATIONS+=(-destination 'platform=macOS,arch=x86_64,variant=Mac Catalyst')
-            LIBRARIES+=(-library ./out/$CONFIGURATION-maccatalyst/librealm-js-ios.a -headers ./_include)
-            BUILD_LIB_CMDS+=("xcrun libtool -static -D -o ./out/$CONFIGURATION-maccatalyst/librealm-js-ios.a ./out/$CONFIGURATION-maccatalyst/*.a")
         ;;
         iphonesimulator)
             DESTINATIONS+=(-destination 'generic/platform=iOS Simulator')
-            LIBRARIES+=(-library ./out/$CONFIGURATION-iphonesimulator/librealm-js-ios.a -headers ./_include)
-            BUILD_LIB_CMDS+=("xcrun libtool -static -D -o ./out/$CONFIGURATION-iphonesimulator/librealm-js-ios.a ./out/$CONFIGURATION-iphonesimulator/*.a")
         ;;
         *)
             echo "${platform} not supported"
@@ -108,32 +101,34 @@ DEVELOPER_DIR="${DEVELOPER_DIR:-${SELECTED_DEVELOPER_DIR}}"
 # Configure CMake project
 env DEVELOPER_DIR="$DEVELOPER_DIR" SDKROOT="$SDKROOT" $CMAKE_PATH "$BINDGEN_PATH" -GXcode \
     -DCMAKE_TOOLCHAIN_FILE="$BINDGEN_PATH/vendor/realm-core/tools/cmake/xcode.toolchain.cmake" \
-    -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$(pwd)/out/$<CONFIG>\$EFFECTIVE_PLATFORM_NAME" \
-    # -DCMAKE_C_COMPILER="$PROJECT_ROOT/scripts/ccache-clang.sh" \
-    # -DCMAKE_CXX_COMPILER="$PROJECT_ROOT/scripts/ccache-clang++.sh"
-    # -DCMAKE_C_COMPILER="/usr/bin/clang" \
-    # -DCMAKE_CXX_COMPILER="/usr/bin/clang++"\
+    -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$(pwd)/out" \
 
 
 DEVELOPER_DIR="$DEVELOPER_DIR" xcodebuild build \
     -scheme realm-js-ios \
     "${DESTINATIONS[@]}" \
     -configuration $CONFIGURATION \
-    # CC="$PROJECT_ROOT/scripts/ccache-clang.sh" \
-    # CXX="$PROJECT_ROOT/scripts/ccache-clang++.sh" \
     ONLY_ACTIVE_ARCH=NO \
     BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
     SUPPORTS_MACCATALYST=YES
 
-for cmd in "${BUILD_LIB_CMDS[@]}"; do
-    eval "${cmd}"
-done
-
+# copy needed headers into project
 rm -rf _include
 mkdir -p _include/realm-js-ios
 cp "$BINDING_PATH"/jsi/jsi_init.h _include/realm-js-ios/
 
-rm -rf ../realm-js-ios.xcframework
-xcodebuild -create-xcframework \
-    "${LIBRARIES[@]}" \
-    -output ../realm-js-ios.xcframework
+# copy built into a unified location
+rm -rf libs
+mkdir libs
+cp out/$CONFIGURATION/*.a libs
+
+# Rename the *.a files so there are the same regardles if configuration was debug or release
+
+pushd libs
+
+find . -type f -name "*-dbg*" | while read -r file; do
+    # Construct new filename by removing '-dbg'
+    newfile=$(echo "$file" | sed 's/-dbg//')
+    # Rename the file
+    mv "$file" "$newfile"
+done