diff options
| author | Daniel Seither <[email protected]> | 2015-10-13 14:23:34 +0200 |
|---|---|---|
| committer | Daniel Seither <[email protected]> | 2015-10-13 14:23:34 +0200 |
| commit | 2fb36225d40f46f02f0bb0f0e40e665c96b5b5a1 (patch) | |
| tree | 6a9d5ead2b6546feb69c225478fb3d4880335fd6 | |
| parent | 29b560eba79631436fa475dde1f18ece434befed (diff) | |
Travis CI: Enable 64 bit builds for iOS
* Update Xcode from 6.4 to 7, which also updates the iOS SDK from 8 to 9
* Remove iOS shared library build, which is not very useful
* Add 64 bit iOS static library build
* Refactor build script to use xcrun instead of manually specifying a
sysroot
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/build.sh | 22 |
2 files changed, 22 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 2f268564c..2efbb1f91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ os: - linux - osx -osx_image: xcode6.4 +osx_image: xcode7 compiler: - clang @@ -34,8 +34,8 @@ env: - TARGETOS="desktop" MODULES="min" BUILD_MODE="shared" - TARGETOS="desktop" MODULES="min" BUILD_MODE="static" - - TARGETOS="ios" MODULES="all" BUILD_MODE="shared" - - TARGETOS="ios" MODULES="all" BUILD_MODE="static" + - TARGETOS="ios32" MODULES="all" BUILD_MODE="static" + - TARGETOS="ios64" MODULES="all" BUILD_MODE="static" matrix: exclude: @@ -50,9 +50,9 @@ matrix: - compiler: clang env: TARGETOS="desktop" MODULES="min" BUILD_MODE="static" - os: linux - env: TARGETOS="ios" MODULES="all" BUILD_MODE="shared" + env: TARGETOS="ios32" MODULES="all" BUILD_MODE="static" - os: linux - env: TARGETOS="ios" MODULES="all" BUILD_MODE="static" + env: TARGETOS="ios64" MODULES="all" BUILD_MODE="static" # END BUILD MATRIX cache: diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index 8bb8c9380..6834b6ae0 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -23,7 +23,7 @@ if [ "$CXX" = "g++" ]; then export CXX="/usr/bin/g++-4.8" fi -#enable ccache +# enable ccache if [ "$TRAVIS_OS_NAME" = "linux" ]; then ccache --max-size=30M ccache --show-stats @@ -31,10 +31,17 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="ccache $CXX" fi -if [ "$TARGETOS" = "ios" ]; then +# configure +if [ "$TARGETOS" = "ios32" ]; then ./configure.py "${CFG_FLAGS[@]}" --cpu=armv7 --cc=clang \ - --cc-abi-flags="-arch armv7 -arch armv7s -stdlib=libc++ --sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/" \ + --cc-abi-flags="-arch armv7 -arch armv7s -stdlib=libc++" \ --prefix=/tmp/botan-installation + +elif [ "$TARGETOS" = "ios64" ]; then + ./configure.py "${CFG_FLAGS[@]}" --cpu=armv8-a --cc=clang \ + --cc-abi-flags="-arch arm64 -stdlib=libc++" \ + --prefix=/tmp/botan-installation + else $CXX --version ./configure.py "${CFG_FLAGS[@]}" --cc="$CC" --cc-bin="$CXX" \ @@ -42,9 +49,14 @@ else --prefix=/tmp/botan-installation fi -make -j 2 +# build +if [ "${TARGETOS:0:3}" = "ios" ]; then + xcrun --sdk iphoneos make -j 2 +else + make -j 2 +fi -if [ "$MODULES" != "min" ] && [ "$TARGETOS" != "ios" ]; then +if [ "$MODULES" != "min" ] && [ "${TARGETOS:0:3}" != "ios" ]; then ./botan-test fi |