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

Run apple command as list.

This commit is contained in:
Matthieu Gautier 2023-11-30 15:32:31 +01:00
parent b7c4854d83
commit ab273f7d12
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kiwixbuild/dependencies/apple_xcframework.py
View File

@ -56,8 +56,13 @@ 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 " command = [
command += " ".join(static_ars) "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
@ -76,21 +81,28 @@ class AppleXCFramework(Dependency):
fat_dir = pj(self.buildEnv.build_dir, "macOS_fat") fat_dir = pj(self.buildEnv.build_dir, "macOS_fat")
os.makedirs(fat_dir, exist_ok=True) os.makedirs(fat_dir, exist_ok=True)
command = "lipo -create -output {fat_dir}/merged.a ".format(fat_dir=fat_dir) output_merged = pj(fat_dir, "merged.a")
command += " ".join(macos_libs) command = [
"lipo",
"-create",
"-output",
output_merged,
*macos_libs
]
run_command(command, self.buildEnv.build_dir, context) run_command(command, self.buildEnv.build_dir, context)
return [pj(fat_dir, "merged.a")] return [output_merged]
def _build_xcframework(self, xcf_libs, context): def _build_xcframework(self, xcf_libs, context):
# create xcframework # create xcframework
ref_plat = PlatformInfo.get_platform(self.macos_subplatforms[0]) ref_plat = PlatformInfo.get_platform(self.macos_subplatforms[0])
command = "xcodebuild -create-xcframework " command = ["xcodebuild", "-create-xcframework"]
for lib in xcf_libs: for lib in xcf_libs:
command += " -library {lib} -headers {include}".format( command += [
lib=lib, include=pj(ref_plat.buildEnv.install_dir, "include") "-library", lib,
) "-headers", pj(ref_plat.buildEnv.install_dir, "include")
command += " -output {dest}".format(dest=self.final_path) ]
command += ["-output", self.final_path]
run_command(command, self.buildEnv.build_dir, context) run_command(command, self.buildEnv.build_dir, context)
def build(self): def build(self):