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 #62 from kiwix/apple_platforms 

Adding a few changes for Apple platforms
This commit is contained in:
Matthieu Gautier 2017-07-17 15:00:16 +02:00 committed by GitHub
parent 91952aba33 a9eaa71357
commit ac5dc39955
1 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
kiwix-build.py
View File

@ -109,6 +109,12 @@ PACKAGE_NAME_MAPPERS = {
'COMMON': _debian_common + ['default-jdk'], 'COMMON': _debian_common + ['default-jdk'],
'ctpp2c': ['ctpp2-utils'], 'ctpp2c': ['ctpp2-utils'],
}, },
'Darwin_native_dyn': {
'COMMON': ['autoconf', 'automake', 'libtool', 'cmake', 'pkg-config'],
},
'Darwin_iOS_static': {
'COMMON': ['autoconf', 'automake', 'libtool', 'cmake', 'pkg-config'],
},
} }
@ -119,10 +125,11 @@ def which(name):
class TargetInfo: class TargetInfo:
def __init__(self, build, static, toolchains): def __init__(self, build, static, toolchains, hosts=None):
self.build = build self.build = build
self.static = static self.static = static
self.toolchains = toolchains self.toolchains = toolchains
self.compatible_hosts = hosts
def __str__(self): def __str__(self):
return "{}_{}".format(self.build, 'static' if self.static else 'dyn') return "{}_{}".format(self.build, 'static' if self.static else 'dyn')
@ -173,7 +180,8 @@ class AndroidTargetInfo(TargetInfo):
} }
def __init__(self, arch): def __init__(self, arch):
super().__init__('android', True, ['android_ndk', 'android_sdk']) super().__init__('android', True, ['android_ndk', 'android_sdk'],
hosts=['fedora', 'debian'])
self.arch = arch self.arch = arch
self.arch_full, self.cpu, self.abi = self.__arch_infos[arch] self.arch_full, self.cpu, self.abi = self.__arch_infos[arch]
@ -194,21 +202,34 @@ class AndroidTargetInfo(TargetInfo):
}, },
} }
class iOSTargetInfo(TargetInfo):
def __init__(self, arch):
super().__init__('iOS', True, ['iOS_sdk'],
hosts=['Darwin'])
self.arch = arch
class BuildEnv: class BuildEnv:
target_platforms = { target_platforms = {
'native_dyn': TargetInfo('native', False, []), 'native_dyn': TargetInfo('native', False, [],
'native_static': TargetInfo('native', True, []), hosts=['fedora', 'debian', 'Darwin']),
'win32_dyn': TargetInfo('win32', False, ['mingw32_toolchain']), 'native_static': TargetInfo('native', True, [],
'win32_static': TargetInfo('win32', True, ['mingw32_toolchain']), hosts=['fedora', 'debian']),
'armhf_dyn': TargetInfo('armhf', False, ['armhf_toolchain']), 'win32_dyn': TargetInfo('win32', False, ['mingw32_toolchain'],
'armhf_static': TargetInfo('armhf', True, ['armhf_toolchain']), hosts=['fedora', 'debian']),
'win32_static': TargetInfo('win32', True, ['mingw32_toolchain'],
hosts=['fedora', 'debian']),
'armhf_dyn': TargetInfo('armhf', False, ['armhf_toolchain'],
hosts=['fedora', 'debian']),
'armhf_static': TargetInfo('armhf', True, ['armhf_toolchain'],
hosts=['fedora', 'debian']),
'android_arm': AndroidTargetInfo('arm'), 'android_arm': AndroidTargetInfo('arm'),
'android_arm64': AndroidTargetInfo('arm64'), 'android_arm64': AndroidTargetInfo('arm64'),
'android_mips': AndroidTargetInfo('mips'), 'android_mips': AndroidTargetInfo('mips'),
'android_mips64': AndroidTargetInfo('mips64'), 'android_mips64': AndroidTargetInfo('mips64'),
'android_x86': AndroidTargetInfo('x86'), 'android_x86': AndroidTargetInfo('x86'),
'android_x86_64': AndroidTargetInfo('x86_64'), 'android_x86_64': AndroidTargetInfo('x86_64'),
'iOS_arm64': iOSTargetInfo('arm64'),
} }
def __init__(self, options, targetsDict): def __init__(self, options, targetsDict):
@ -269,6 +290,11 @@ class BuildEnv:
def setup_build(self, target_platform): def setup_build(self, target_platform):
self.platform_info = self.target_platforms[target_platform] self.platform_info = self.target_platforms[target_platform]
if self.distname not in self.platform_info.compatible_hosts:
print(('ERROR: The target {} cannot be build on host {}.\n'
'Select another target platform, or change your host system.'
).format(target_platform, self.distname))
sys.exit(-1)
self.cross_config = self.platform_info.get_cross_config(self.distname) self.cross_config = self.platform_info.get_cross_config(self.distname)
def setup_toolchains(self): def setup_toolchains(self):
@ -308,6 +334,9 @@ class BuildEnv:
self.cmake_crossfile = self._gen_crossfile('cmake_cross_file.txt') self.cmake_crossfile = self._gen_crossfile('cmake_cross_file.txt')
self.meson_crossfile = self._gen_crossfile('meson_cross_file.txt') self.meson_crossfile = self._gen_crossfile('meson_cross_file.txt')
def setup_iOS(self):
pass
def __getattr__(self, name): def __getattr__(self, name):
return getattr(self.options, name) return getattr(self.options, name)
@ -455,6 +484,9 @@ class BuildEnv:
elif self.distname in ('debian', 'Ubuntu'): elif self.distname in ('debian', 'Ubuntu'):
package_installer = 'sudo apt-get install {}' package_installer = 'sudo apt-get install {}'
package_checker = 'LANG=C dpkg -s {} 2>&1 | grep Status | grep "ok installed" 1>/dev/null 2>&1' package_checker = 'LANG=C dpkg -s {} 2>&1 | grep Status | grep "ok installed" 1>/dev/null 2>&1'
elif self.distname == 'Darwin':
package_installer = 'brew install {}'
package_checker = 'brew list -1 | grep -q {}'
mapper_name = "{host}_{target}".format( mapper_name = "{host}_{target}".format(
host=self.distname, host=self.distname,
target=self.platform_info) target=self.platform_info)
@ -822,6 +854,10 @@ class armhf_toolchain(Toolchain):
env['CXX'] = self.binaries['CXX'] env['CXX'] = self.binaries['CXX']
class iOS_sdk(Toolchain):
pass
class Builder: class Builder:
def __init__(self, options): def __init__(self, options):
self.options = options self.options = options