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

Merge pull request #441 from kiwix/iOS_remove_32bit_builds

This commit is contained in:
Matthieu Gautier 2020-05-11 12:02:41 +02:00 committed by GitHub
parent d3466f32fe d0677492d1
commit 77b57761dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,9 +140,7 @@ jobs:
target: target:
- native_dyn - native_dyn
- iOS_arm64 - iOS_arm64
- iOS_i386
- iOS_x86_64 - iOS_x86_64
- iOS_armv7
runs-on: macos-latest runs-on: macos-latest
env: env:
SSH_KEY: /tmp/id_rsa SSH_KEY: /tmp/id_rsa

2
.travis.yml
View File

@ -45,8 +45,6 @@ jobs:
os: osx os: osx
- env: PLATFORM="iOS_arm64" - env: PLATFORM="iOS_arm64"
os: osx os: osx
- env: PLATFORM="iOS_i386"
os: osx

2
kiwixbuild/__init__.py
View File

@ -57,7 +57,7 @@ def parse_args():
if not options.android_arch: if not options.android_arch:
options.android_arch = ['arm', 'arm64', 'x86', 'x86_64'] options.android_arch = ['arm', 'arm64', 'x86', 'x86_64']
if not options.ios_arch: if not options.ios_arch:
options.ios_arch = ['armv7', 'arm64', 'i386', 'x86_64'] options.ios_arch = ['arm64', 'x86_64']
if not options.target_platform: if not options.target_platform:
if options.target in ('kiwix-lib-app',): if options.target in ('kiwix-lib-app',):

16
kiwixbuild/platforms/ios.py
View File

@ -9,7 +9,7 @@ class iOSPlatformInfo(PlatformInfo):
build = 'iOS' build = 'iOS'
static = True static = True
compatible_hosts = ['Darwin'] compatible_hosts = ['Darwin']
min_iphoneos_version = '9.0' min_iphoneos_version = '11.0'
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -49,7 +49,7 @@ class iOSPlatformInfo(PlatformInfo):
def get_env(self): def get_env(self):
env = super().get_env() env = super().get_env()
env['MACOSX_DEPLOYMENT_TARGET'] = '10.10' env['MACOSX_DEPLOYMENT_TARGET'] = '10.13'
return env return env
def set_comp_flags(self, env): def set_comp_flags(self, env):
@ -78,24 +78,12 @@ class iOSPlatformInfo(PlatformInfo):
def configure_option(self): def configure_option(self):
return '--host={}'.format(self.arch_full) return '--host={}'.format(self.arch_full)
class iOSArmv7(iOSPlatformInfo):
name = 'iOS_armv7'
arch = cpu = 'armv7'
arch_full = 'armv7-apple-darwin'
sdk_name = 'iphoneos'
class iOSArm64(iOSPlatformInfo): class iOSArm64(iOSPlatformInfo):
name = 'iOS_arm64' name = 'iOS_arm64'
arch = cpu = 'arm64' arch = cpu = 'arm64'
arch_full = 'arm-apple-darwin' arch_full = 'arm-apple-darwin'
sdk_name = 'iphoneos' sdk_name = 'iphoneos'
class iOSi386(iOSPlatformInfo):
name = 'iOS_i386'
arch = cpu = 'i386'
arch_full = 'i386-apple-darwin'
sdk_name = 'iphonesimulator'
class iOSx64(iOSPlatformInfo): class iOSx64(iOSPlatformInfo):
name = 'iOS_x86_64' name = 'iOS_x86_64'
arch = cpu = 'x86_64' arch = cpu = 'x86_64'