Merge pull request #241 from kiwix/default_platform_custom_app

Default platform custom app
This commit is contained in:
Matthieu Gautier 2018-08-20 17:53:48 +02:00 committed by GitHub
commit bd33238d60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View File

@ -72,6 +72,12 @@ def parse_args():
if not options.ios_arch:
options.ios_arch = ['armv7', 'arm64', 'i386', 'x86_64']
if not options.target_platform:
if options.target in ('kiwix-android', 'kiwix-android-custom'):
options.target_platform = 'android'
else:
options.target_platform = 'native_dyn'
return options
def main():

View File

@ -18,11 +18,6 @@ class Builder:
PlatformInfo.get_platform('neutral', self._targets)
target_platform = option('target_platform')
if not target_platform:
if option('target') == 'kiwix-android':
target_platform = 'android'
else:
target_platform = 'native_dyn'
platform = PlatformInfo.get_platform(target_platform, self._targets)
if neutralEnv('distname') not in platform.compatible_hosts:
print(('ERROR: The target platform {} cannot be build on host {}.\n'