mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Travis: build Android against Qt 5.11.1

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2018-07-09 22:07:03 -07:00
parent c62ce43ecf
commit dc2f0f8e48
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packaging/android/android-build-wrapper.sh
View file

@ -6,21 +6,13 @@
# 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)
# 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"
fi
exec 1> >(tee ./build.log) 2>&1
USE_X=$(case $- in *x*) echo "-x" ;; esac)
@ -28,6 +20,18 @@ 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
PLATFORM=$(uname)
pushd $(dirname "$0")/../../