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 #161 from kiwix/travis_ios 

Travis ios
This commit is contained in:
Matthieu Gautier 2018-04-24 19:36:43 +02:00 committed by GitHub
parent 8467cca46a b4f8d2cc7b
commit a888602f77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -72,6 +72,10 @@ matrix:
if: type!=cron AND type!=pull_request if: type!=cron AND type!=pull_request
- env: PLATFORM="native_dyn" - env: PLATFORM="native_dyn"
os: osx os: osx
- env: PLATFORM="iOS_arm64"
os: osx
- env: PLATFORM="iOS_i386"
os: osx
notifications: notifications:
irc: irc:

5
MANIFEST.in
View File

@ -1,5 +1,2 @@
include kiwixbuild/templates/cmake_cross_file.txt include kiwixbuild/templates/*_cross_file.txt
include kiwixbuild/templates/meson_cross_file.txt
include kiwixbuild/templates/cmake_android_cross_file.txt
include kiwixbuild/templates/cmake_i586_cross_file.txt
include kiwixbuild/patches/*.patch include kiwixbuild/patches/*.patch

2
kiwixbuild/__init__.py
View File

@ -635,7 +635,7 @@ class iOS_sdk(Toolchain):
env['CFLAGS'] = " -fembed-bitcode -isysroot {SDKROOT} -arch {arch} -miphoneos-version-min=9.0 ".format(SDKROOT=self.root_path, arch=arch) + env['CFLAGS'] env['CFLAGS'] = " -fembed-bitcode -isysroot {SDKROOT} -arch {arch} -miphoneos-version-min=9.0 ".format(SDKROOT=self.root_path, arch=arch) + env['CFLAGS']
env['CXXFLAGS'] = env['CFLAGS'] + " -stdlib=libc++ -std=c++11 "+env['CXXFLAGS'] env['CXXFLAGS'] = env['CFLAGS'] + " -stdlib=libc++ -std=c++11 "+env['CXXFLAGS']
env['LDFLAGS'] = " -arch {arch} -isysroot {SDKROOT} ".format(SDKROOT=self.root_path, arch=arch) env['LDFLAGS'] = " -arch {arch} -isysroot {SDKROOT} ".format(SDKROOT=self.root_path, arch=arch)
env['MACOSX_DEPLOYMENT_TARGET'] = "10.4" env['MACOSX_DEPLOYMENT_TARGET'] = "10.7"
def set_compiler(self, env): def set_compiler(self, env):
env['CC'] = self.binaries['CC'] env['CC'] = self.binaries['CC']

0
templates/cmake_ios_cross_file.txt → kiwixbuild/templates/cmake_ios_cross_file.txt
View File

4
travis/compile_all.py
View File

@ -196,6 +196,8 @@ except URLError:
if environ['TRAVIS_EVENT_TYPE'] != 'cron' and not make_release: if environ['TRAVIS_EVENT_TYPE'] != 'cron' and not make_release:
if PLATFORM.startswith('android'): if PLATFORM.startswith('android'):
TARGETS = ('kiwix-android',) TARGETS = ('kiwix-android',)
elif PLATFORM.startswith('iOS'):
TARGETS = ('kiwix-lib',)
elif PLATFORM.startswith('native_'): elif PLATFORM.startswith('native_'):
if TRAVIS_OS_NAME == "osx": if TRAVIS_OS_NAME == "osx":
TARGETS = ('kiwix-lib', 'zim-tools', 'zimwriterfs') TARGETS = ('kiwix-lib', 'zim-tools', 'zimwriterfs')
@ -217,6 +219,8 @@ if PLATFORM.startswith('android'):
TARGETS = ('libzim', 'kiwix-lib') TARGETS = ('libzim', 'kiwix-lib')
else: else:
TARGETS = ('libzim', 'kiwix-lib', 'kiwix-android') TARGETS = ('libzim', 'kiwix-lib', 'kiwix-android')
elif PLATFORM.startswith('iOS'):
TARGETS = ('libzim', 'kiwix-lib')
elif PLATFORM.startswith('native_'): elif PLATFORM.startswith('native_'):
if TRAVIS_OS_NAME == "osx": if TRAVIS_OS_NAME == "osx":
TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib') TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib')