diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-07-09 22:07:03 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-07-09 22:20:18 -0700 |
| commit | dc2f0f8e48e12dbf60639df15dcf1ea5069d2db8 (patch) | |
| tree | e7911f4426bfa4c5c8fb613943990e9ccdec2022 /packaging | |
| parent | c62ce43ecf8d2c72d6acaa5e1727c8d31c6e30a0 (diff) | |
| download | subsurface-dc2f0f8e48e12dbf60639df15dcf1ea5069d2db8.tar.gz | |
Travis: build Android against Qt 5.11.1
Instead of dealing with the challenges of downloading and installing the
official package (which really prefers to be run interactively and
frequently caused Travis failures) we get the pre-packed bits from our
cache instead. Less data to transfer, quicker install.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index ef78b293f..16d50ce82 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -6,28 +6,32 @@ # cmake fails reporting :No known features for CXX compiler "GNU". In that # case simly comment out the "set(property(TARGET Qt5::Core PROPERTY...)" # at line 101 of -# Qt/5.7/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake +# Qt/5.7/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake # or at line 95 of # Qt/5.8/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake # or at line 105 of # Qt/5.9/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake # (this script tries to do this automatically) +exec 1> >(tee ./build.log) 2>&1 + +USE_X=$(case $- in *x*) echo "-x" ;; esac) + +# these are the current versions for Qt, Android SDK & NDK: +source subsurface/packaging/android/variables.sh + # avoid timeouts on Travis when downloads take a long time SLOW_PROG="" if [ -n "${TRAVIS:-}" ]; then source subsurface/scripts/travis-wait.sh set -x # make debugging Travis easier SLOW_PROG="travis_wait" + # since we are running on Travis, let's just get our minimal Qt install + mkdir -p Qt/"${LATEST_QT}" + $SLOW_PROG wget -q https://storage.googleapis.com/travis-cache/Qt-"${LATEST_QT}"-android.tar.xz + tar -xJ -C Qt/"${LATEST_QT}" -f Qt-"${LATEST_QT}"-android.tar.xz fi -exec 1> >(tee ./build.log) 2>&1 - -USE_X=$(case $- in *x*) echo "-x" ;; esac) - -# these are the current versions for Qt, Android SDK & NDK: -source subsurface/packaging/android/variables.sh - PLATFORM=$(uname) pushd $(dirname "$0")/../../ |