From 9f74c79c7dc103e6c718d56dcbb3da5516a67972 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Sun, 9 Nov 2014 09:37:04 +1100 Subject: First attempt at osx android in travis --- .travis.yml | 2 +- scripts/travis_before_install.sh | 111 ++++++++++++++++++++++++++++----------- 2 files changed, 81 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b7f6ba5fd..935e2c495c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ before_install: - export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c" - export NDK_HOME="$(pwd)/android-ndk-r10c" - export JAVA_HOME="$(pwd)/jdk1.7.0_71" -- export ANDROID_HOME="$(pwd)/android-sdk-linux" +- export ANDROID_HOME="$(pwd)/android-sdk" - ./scripts/travis_before_install.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 36681b1bfa..7404f5d1fe 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -4,45 +4,94 @@ set -o pipefail if [[ "${MASON_PLATFORM}" == "android" ]]; then - echo "debug: installing 7z" - #mapbox_time "installing 7z" \ - MASON_PLATFORM= ./.mason/mason install 7z 9.20 - echo "debug: setting 7z path" - SEVEN_ZIP_PATH="$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za" + if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - echo "debug: fetching NDK" - #mapbox_time "fetching NDK" \ - wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin + echo "debug: installing 7z" + #mapbox_time "installing 7z" \ + MASON_PLATFORM= ./.mason/mason install 7z 9.20 - echo "debug: chmod NDK" - chmod a+x ./android-ndk-r10c-linux-x86_64.bin + echo "debug: setting 7z path" + SEVEN_ZIP_PATH="$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za" - echo "debug: unpacking NDK" - #mapbox_time "unpacking NDK" \ - $SEVEN_ZIP_PATH x ./android-ndk-r10c-linux-x86_64.bin > .tmp-ndk-log - rm .tmp-ndk-log + echo "debug: fetching NDK" + #mapbox_time "fetching NDK" \ + wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin - echo "debug: fetching JDK" - #mapbox_time "fetching JDK" \ - wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u71-b14/jdk-7u71-linux-x64.tar.gz + echo "debug: chmod NDK" + chmod a+x ./android-ndk-r10c-linux-x86_64.bin - echo "debug: unpacking JDK" - #mapbox_time "unpacking JDK" \ - tar -xzf ./jdk-7u71-linux-x64.tar.gz + echo "debug: unpacking NDK" + #mapbox_time "unpacking NDK" \ + $SEVEN_ZIP_PATH x ./android-ndk-r10c-linux-x86_64.bin > .tmp-ndk-log + rm .tmp-ndk-log - echo "debug: fetching SDK" - #mapbox_time "fetching SDK" \ - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz + echo "debug: fetching JDK" + #mapbox_time "fetching JDK" \ + wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u71-b14/jdk-7u71-linux-x64.tar.gz - echo "debug: unpacking SDK" - #mapbox_time "unpacking SDK" \ - tar -xzf ./android-sdk_r23.0.2-linux.tgz + echo "debug: unpacking JDK" + #mapbox_time "unpacking JDK" \ + tar -xzf ./jdk-7u71-linux-x64.tar.gz + + echo "debug: fetching SDK" + #mapbox_time "fetching SDK" \ + wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz + + echo "debug: unpacking SDK" + #mapbox_time "unpacking SDK" \ + tar -xzf ./android-sdk_r23.0.2-linux.tgz + mv ./android-sdk-linux ./android-sdk + + echo "debug: installing SDK" + #mapbox_time "installing SDK" \ + sudo apt-get -y install lib32stdc++6 lib32z1 + echo y | ./android-sdk-linux/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.0,android-19,android-21,extra-android-m2repository,extra-google-m2repository + +elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then + + echo "debug: installing 7z" + #mapbox_time "installing 7z" \ + MASON_PLATFORM= ./.mason/mason install 7z 9.20 + + echo "debug: setting 7z path" + SEVEN_ZIP_PATH="$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za" + + echo "debug: fetching NDK" + #mapbox_time "fetching NDK" \ + wget http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86_64.bin + + echo "debug: chmod NDK" + chmod a+x ./android-ndk-r10c-darwin-x86_64.bin + + echo "debug: unpacking NDK" + #mapbox_time "unpacking NDK" \ + $SEVEN_ZIP_PATH x ./android-ndk-r10c-darwin-x86_64.bin > .tmp-ndk-log + rm .tmp-ndk-log + + echo "debug: fetching JDK" + #mapbox_time "fetching JDK" \ + wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u71-b14/jdk-7u71-macosx-x64.dmg + + echo "debug: unpacking JDK" + #mapbox_time "unpacking JDK" \ + # TODO how to do this? + + echo "debug: fetching SDK" + #mapbox_time "fetching SDK" \ + wget http://dl.google.com/android/android-sdk_r23.0.2-macosx.zip + + echo "debug: unpacking SDK" + #mapbox_time "unpacking SDK" \ + unzip android-sdk_r23.0.2-macosx.zip + mv ./android-sdk-macosx ./android-sdk + + echo "debug: installing SDK" + #mapbox_time "installing SDK" \ + echo y | ./android-sdk-linux/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.0,android-19,android-21,extra-android-m2repository,extra-google-m2repository + + fi - echo "debug: installing SDK" - #mapbox_time "installing SDK" \ - sudo apt-get -y install lib32stdc++6 lib32z1 - echo y | ./android-sdk-linux/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.0,android-19,android-21,extra-android-m2repository,extra-google-m2repository fi if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then @@ -74,7 +123,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then llvm-3.4 # required for mesa echo "install_mesa" - MASON_PLATFORM= mason install mesa 10.3.1 + MASON_PLATFORM = mason install mesa 10.3.1 echo "install_awscli" sudo pip install awscli -- cgit v1.2.1