diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-22 09:45:33 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-12-30 11:20:34 -0800 |
| commit | f39b07dec3bfef91a80b753bc1cf5d989ec2e669 (patch) | |
| tree | 86bf15fccecc642b6f31bf79d5a2ca021995aef9 | |
| parent | b0e81ff978c62d44b62a72a6969ea1d9d0245e6d (diff) | |
| download | subsurface-f39b07dec3bfef91a80b753bc1cf5d989ec2e669.tar.gz | |
Android: cleanup build wrapper script
This way it can be run both to create the docker container or
independently for a full build.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 11 | ||||
| -rw-r--r-- | packaging/android/qt-installer-noninteractive.qs (renamed from qt-installer-noninteractive.qs) | 0 |
2 files changed, 5 insertions, 6 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 65ea17198..e6b43d1e4 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -35,7 +35,8 @@ while [[ $# -gt 0 ]] ; do done # these are the current versions for Qt, Android SDK & NDK: -source subsurface/packaging/android/variables.sh +SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )" +source "$SCRIPTDIR"/variables.sh # avoid timeouts on Travis when downloads take a long time SLOW_PROG="" @@ -51,9 +52,7 @@ fi PLATFORM=$(uname) -pushd $(dirname "$0")/../../ -export SUBSURFACE_SOURCE=$PWD -popd +export SUBSURFACE_SOURCE="$SCRIPTDIR"/../.. if [ "$PLATFORM" = Linux ] ; then QT_BINARIES=qt-opensource-linux-x64-${LATEST_QT}.run @@ -122,13 +121,13 @@ if [ ! -d Qt/"${LATEST_QT}"/android_armv7 ] ; then $SLOW_PROG wget -q "${QT_DOWNLOAD_URL}" fi chmod +x ./"${QT_BINARIES}" - ./"${QT_BINARIES}" --platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations + ./"${QT_BINARIES}" --platform minimal --script "$SCRIPTDIR"/qt-installer-noninteractive.qs --no-force-installations -v fi # patch the cmake / Qt5.7.1 incompatibility mentioned above sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/# set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/' Qt/"${LATEST_QT}"/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake -if [ ! -z $PREP_ONLY ] ; then +if [ ! -z ${PREP_ONLY+x} ] ; then exit 0 fi diff --git a/qt-installer-noninteractive.qs b/packaging/android/qt-installer-noninteractive.qs index b0ec88022..b0ec88022 100644 --- a/qt-installer-noninteractive.qs +++ b/packaging/android/qt-installer-noninteractive.qs |