Lower-cased a few additional iOS strings

This commit is contained in:
rgaudin 2025-06-23 13:30:57 +00:00
parent 4babd746a8
commit dd84af0080
No known key found for this signature in database
7 changed files with 11 additions and 11 deletions

View File

@ -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 As for `android`, `kiwix-build` will build the library several times
(once for each platform) and then create the fat library. (once for each platform) and then create the fat library.
```bash ```bash
kiwix-build --config iOS_multi libkiwix kiwix-build --config ios_multi libkiwix
``` ```
You can specify the supported architectures with the option `--ios-arch`: You can specify the supported architectures with the option `--ios-arch`:
```bash ```bash
kiwix-build --config iOS_multi libkiwix # all architetures 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 --ios-arch arm --ios-arch arm64 # arm and arm64 arch only
``` ```
Outputs Outputs

View File

@ -10,7 +10,7 @@ MIN_MACOS_VERSION = "12.0"
class AppleConfigInfo(ConfigInfo): class AppleConfigInfo(ConfigInfo):
build = "iOS" build = "ios"
static = True static = True
compatible_hosts = ["Darwin"] compatible_hosts = ["Darwin"]
arch = None arch = None
@ -36,7 +36,7 @@ class AppleConfigInfo(ConfigInfo):
return self._root_path return self._root_path
def __str__(self): def __str__(self):
return "iOS" return "ios"
def finalize_setup(self): def finalize_setup(self):
super().finalize_setup() super().finalize_setup()

View File

@ -48,7 +48,7 @@ class AllBaseDependencies(Dependency):
"zim-testing-suite", "zim-testing-suite",
] ]
# Add specific dependencies depending of the config # Add specific dependencies depending of the config
if configInfo.build not in ("android", "iOS"): if configInfo.build not in ("android", "ios"):
# For zimtools # For zimtools
base_deps += ["docoptcpp", "libmagic", "gumbo"] base_deps += ["docoptcpp", "libmagic", "gumbo"]
if ( if (

View File

@ -115,12 +115,12 @@ class AppleXCFramework(Dependency):
"make_macos_fat", "make_macos_fat",
self.make_fat_with, self.make_fat_with,
self.macos_subconfigs, self.macos_subconfigs,
"macOS_fat", "macos_fat",
) )
xcf_libs += self.command( xcf_libs += self.command(
"make_simulator_fat", "make_simulator_fat",
self.make_fat_with, self.make_fat_with,
self.iossimulator_subconfigs, self.iossimulator_subconfigs,
"iOS-simulator_fat", "ios-simulator_fat",
) )
self.command("build_xcframework", self._build_xcframework, xcf_libs) self.command("build_xcframework", self._build_xcframework, xcf_libs)

View File

@ -392,7 +392,7 @@ class MakeBuilder(Builder):
@property @property
def make_install_targets(self): def make_install_targets(self):
if self.buildEnv.configInfo.build in ("iOS", "wasm"): if self.buildEnv.configInfo.build in ("ios", "wasm"):
yield "install" yield "install"
else: else:
yield "install-strip" yield "install-strip"

View File

@ -38,7 +38,7 @@ class Libkiwix(Dependency):
if configInfo.build == "android": if configInfo.build == "android":
yield "-Dstatic-linkage=true" yield "-Dstatic-linkage=true"
yield "-Dwerror=false" yield "-Dwerror=false"
if configInfo.build == "iOS": if configInfo.build == "ios":
yield "-Db_bitcode=true" yield "-Db_bitcode=true"
if configInfo.name == "flatpak": if configInfo.name == "flatpak":
yield "--wrap-mode=nodownload" yield "--wrap-mode=nodownload"

View File

@ -115,7 +115,7 @@ PACKAGE_NAME_MAPPERS = {
"COMMON": ["autoconf", "automake", "libtool", "cmake", "pkg-config"], "COMMON": ["autoconf", "automake", "libtool", "cmake", "pkg-config"],
"file": ["libmagic"], "file": ["libmagic"],
}, },
"Darwin_iOS": { "Darwin_ios": {
"COMMON": ["autoconf", "automake", "libtool", "cmake", "pkg-config"], "COMMON": ["autoconf", "automake", "libtool", "cmake", "pkg-config"],
"file": ["libmagic"], "file": ["libmagic"],
}, },