Updated CI and builddef for renamed platform ; including new arm64 si…

…mulator
kiwix · Dec 5, 2023 · 8c5bca0 · 8c5bca0
1 parent afb7c50
commit 8c5bca0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.github/scripts/build_definition.py b/.github/scripts/build_definition.py
@@ -26,7 +26,8 @@
     | macos   | native_static      |        |          | BP        | BP          |               | macos-x86_64         |
     | macos   | native_mixed       | BP     | BP       |           |             |               | macos-x86_64         |
     | macos   | iOS_arm64          | dB     | dB       |           |             |               |                      |
-    | macos   | iOS_x86_64         | dB     | dB       |           |             |               |                      |
+    | macos   | iOSSimulator_x86_64| dB     | dB       |           |             |               |                      |
+    | macos   | iOSSimulator_arm64 | dB     | dB       |           |             |               |                      |
     | macos   | macOS_arm64_static |        |          | BP        | BP          |               | macos-arm64          |
     | macos   | macOS_arm64_mixed  | BP     | BP       |           |             |               | macos-arm64          |
     | macos   | macOS_x86_64       | B      | B        |           |             |               |                      |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -147,7 +147,8 @@ jobs:
           - native_static
           - native_mixed
           - iOS_arm64
-          - iOS_x86_64
+          - iOSSimulator_x86_64
+          - iOSSimulator_arm64
           - macOS_arm64_static
           - macOS_arm64_mixed
           - macOS_x86_64

diff --git a/kiwixbuild/dependencies/apple_xcframework.py b/kiwixbuild/dependencies/apple_xcframework.py
@@ -70,6 +70,7 @@ def _merge_libs(self, context):
                 static_ars = [str(f) for f in Path(lib_dir).glob("*.a")]
 
                 # create merged.a from all *.a in install_dir/lib
+                command = ["libtool", "-static", "-o", "merged.a", *static_ars]
                 run_command(command, lib_dir, context)
 
                 # will be included in xcframework
@@ -89,13 +90,7 @@ def make_fat_with(self, platforms, folder_name, context):
             os.makedirs(fat_dir, exist_ok=True)
 
             output_merged = pj(fat_dir, "merged.a")
-            command = [
-                "lipo",
-                "-create",
-                "-output",
-                output_merged,
-                *libs
-            ]
+            command = ["lipo", "-create", "-output", output_merged, *libs]
             run_command(command, self.buildEnv.build_dir, context)
 
             return [output_merged]
@@ -106,8 +101,10 @@ def _build_xcframework(self, xcf_libs, context):
             command = ["xcodebuild", "-create-xcframework"]
             for lib in xcf_libs:
                 command += [
-                    "-library", lib,
-                    "-headers", pj(ref_plat.buildEnv.install_dir, "include")
+                    "-library",
+                    lib,
+                    "-headers",
+                    pj(ref_plat.buildEnv.install_dir, "include"),
                 ]
             command += ["-output", self.final_path]
             run_command(command, self.buildEnv.build_dir, context)