diff --git a/.travis.yml b/.travis.yml index c58e7e0..9620ff2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,6 +72,10 @@ matrix: if: type!=cron AND type!=pull_request - env: PLATFORM="native_dyn" os: osx + - env: PLATFORM="iOS_arm64" + os: osx + - env: PLATFORM="iOS_i386" + os: osx notifications: irc: diff --git a/MANIFEST.in b/MANIFEST.in index ea3afa9..ace8009 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,2 @@ -include kiwixbuild/templates/cmake_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/templates/*_cross_file.txt include kiwixbuild/patches/*.patch diff --git a/kiwixbuild/__init__.py b/kiwixbuild/__init__.py index e780385..4196d76 100644 --- a/kiwixbuild/__init__.py +++ b/kiwixbuild/__init__.py @@ -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['CXXFLAGS'] = env['CFLAGS'] + " -stdlib=libc++ -std=c++11 "+env['CXXFLAGS'] 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): env['CC'] = self.binaries['CC'] diff --git a/templates/cmake_ios_cross_file.txt b/kiwixbuild/templates/cmake_ios_cross_file.txt similarity index 100% rename from templates/cmake_ios_cross_file.txt rename to kiwixbuild/templates/cmake_ios_cross_file.txt diff --git a/travis/compile_all.py b/travis/compile_all.py index 5ede3f2..dbc24bb 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -196,6 +196,8 @@ except URLError: if environ['TRAVIS_EVENT_TYPE'] != 'cron' and not make_release: if PLATFORM.startswith('android'): TARGETS = ('kiwix-android',) + elif PLATFORM.startswith('iOS'): + TARGETS = ('kiwix-lib',) elif PLATFORM.startswith('native_'): if TRAVIS_OS_NAME == "osx": TARGETS = ('kiwix-lib', 'zim-tools', 'zimwriterfs') @@ -217,6 +219,8 @@ if PLATFORM.startswith('android'): TARGETS = ('libzim', 'kiwix-lib') else: TARGETS = ('libzim', 'kiwix-lib', 'kiwix-android') +elif PLATFORM.startswith('iOS'): + TARGETS = ('libzim', 'kiwix-lib') elif PLATFORM.startswith('native_'): if TRAVIS_OS_NAME == "osx": TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib')