smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated CI and builddef for renamed platform ; including new arm64 simulator

This commit is contained in:
renaud gaudin 2023-12-04 11:45:04 +00:00
parent afb7c504ea
commit 8c5bca05b7
No known key found for this signature in database
GPG Key ID: 447475A4CFBA2E24
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/scripts/build_definition.py vendored
View File

@ -26,7 +26,8 @@ BUILD_DEF = """
| macos | native_static | | | BP | BP | | macos-x86_64 | | macos | native_static | | | BP | BP | | macos-x86_64 |
| macos | native_mixed | BP | BP | | | | macos-x86_64 | | macos | native_mixed | BP | BP | | | | macos-x86_64 |
| macos | iOS_arm64 | dB | dB | | | | | | 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_static | | | BP | BP | | macos-arm64 |
| macos | macOS_arm64_mixed | BP | BP | | | | macos-arm64 | | macos | macOS_arm64_mixed | BP | BP | | | | macos-arm64 |
| macos | macOS_x86_64 | B | B | | | | | | macos | macOS_x86_64 | B | B | | | | |

3
.github/workflows/ci.yml vendored
View File

@ -147,7 +147,8 @@ jobs:
- native_static - native_static
- native_mixed - native_mixed
- iOS_arm64 - iOS_arm64
- iOS_x86_64 - iOSSimulator_x86_64
- iOSSimulator_arm64
- macOS_arm64_static - macOS_arm64_static
- macOS_arm64_mixed - macOS_arm64_mixed
- macOS_x86_64 - macOS_x86_64

15
kiwixbuild/dependencies/apple_xcframework.py
View File

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