From dd84af0080d81d97e5c64169d76b77a1bb78cdbe Mon Sep 17 00:00:00 2001 From: rgaudin Date: Mon, 23 Jun 2025 13:30:57 +0000 Subject: [PATCH] Lower-cased a few additional iOS strings --- README.md | 6 +++--- kiwixbuild/configs/ios.py | 4 ++-- kiwixbuild/dependencies/all_dependencies.py | 2 +- kiwixbuild/dependencies/apple_xcframework.py | 4 ++-- kiwixbuild/dependencies/base.py | 2 +- kiwixbuild/dependencies/libkiwix.py | 2 +- kiwixbuild/packages.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7de5d57..2ab5df4 100644 --- a/README.md +++ b/README.md @@ -135,13 +135,13 @@ To do so, you should directly use the target-platfrom `ios_multi`. As for `android`, `kiwix-build` will build the library several times (once for each platform) and then create the fat library. ```bash -kiwix-build --config iOS_multi libkiwix +kiwix-build --config ios_multi libkiwix ``` You can specify the supported architectures with the option `--ios-arch`: ```bash -kiwix-build --config iOS_multi libkiwix # all architetures -kiwix-build --config iOS_multi --ios-arch arm --ios-arch arm64 # arm and arm64 arch only +kiwix-build --config ios_multi libkiwix # all architetures +kiwix-build --config ios_multi --ios-arch arm --ios-arch arm64 # arm and arm64 arch only ``` Outputs diff --git a/kiwixbuild/configs/ios.py b/kiwixbuild/configs/ios.py index 654b783..0caba1c 100644 --- a/kiwixbuild/configs/ios.py +++ b/kiwixbuild/configs/ios.py @@ -10,7 +10,7 @@ MIN_MACOS_VERSION = "12.0" class AppleConfigInfo(ConfigInfo): - build = "iOS" + build = "ios" static = True compatible_hosts = ["Darwin"] arch = None @@ -36,7 +36,7 @@ class AppleConfigInfo(ConfigInfo): return self._root_path def __str__(self): - return "iOS" + return "ios" def finalize_setup(self): super().finalize_setup() diff --git a/kiwixbuild/dependencies/all_dependencies.py b/kiwixbuild/dependencies/all_dependencies.py index 4899d32..dad14ab 100644 --- a/kiwixbuild/dependencies/all_dependencies.py +++ b/kiwixbuild/dependencies/all_dependencies.py @@ -48,7 +48,7 @@ class AllBaseDependencies(Dependency): "zim-testing-suite", ] # Add specific dependencies depending of the config - if configInfo.build not in ("android", "iOS"): + if configInfo.build not in ("android", "ios"): # For zimtools base_deps += ["docoptcpp", "libmagic", "gumbo"] if ( diff --git a/kiwixbuild/dependencies/apple_xcframework.py b/kiwixbuild/dependencies/apple_xcframework.py index c1383e8..b07878c 100644 --- a/kiwixbuild/dependencies/apple_xcframework.py +++ b/kiwixbuild/dependencies/apple_xcframework.py @@ -115,12 +115,12 @@ class AppleXCFramework(Dependency): "make_macos_fat", self.make_fat_with, self.macos_subconfigs, - "macOS_fat", + "macos_fat", ) xcf_libs += self.command( "make_simulator_fat", self.make_fat_with, self.iossimulator_subconfigs, - "iOS-simulator_fat", + "ios-simulator_fat", ) self.command("build_xcframework", self._build_xcframework, xcf_libs) diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index 29f2081..7ee209b 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -392,7 +392,7 @@ class MakeBuilder(Builder): @property def make_install_targets(self): - if self.buildEnv.configInfo.build in ("iOS", "wasm"): + if self.buildEnv.configInfo.build in ("ios", "wasm"): yield "install" else: yield "install-strip" diff --git a/kiwixbuild/dependencies/libkiwix.py b/kiwixbuild/dependencies/libkiwix.py index 66c7a59..774f311 100644 --- a/kiwixbuild/dependencies/libkiwix.py +++ b/kiwixbuild/dependencies/libkiwix.py @@ -38,7 +38,7 @@ class Libkiwix(Dependency): if configInfo.build == "android": yield "-Dstatic-linkage=true" yield "-Dwerror=false" - if configInfo.build == "iOS": + if configInfo.build == "ios": yield "-Db_bitcode=true" if configInfo.name == "flatpak": yield "--wrap-mode=nodownload" diff --git a/kiwixbuild/packages.py b/kiwixbuild/packages.py index bfd5ecb..78f231c 100644 --- a/kiwixbuild/packages.py +++ b/kiwixbuild/packages.py @@ -115,7 +115,7 @@ PACKAGE_NAME_MAPPERS = { "COMMON": ["autoconf", "automake", "libtool", "cmake", "pkg-config"], "file": ["libmagic"], }, - "Darwin_iOS": { + "Darwin_ios": { "COMMON": ["autoconf", "automake", "libtool", "cmake", "pkg-config"], "file": ["libmagic"], },