mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

android-wrapper: Auto install Qt

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2017-02-06 15:55:40 +01:00 • committed by Dirk Hohndel
parent 9d235d165e
commit bed5ad31e6
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,10 @@ ANDROID_SDK=android-sdk-linux
PLATFORM=$(uname) PLATFORM=$(uname)
pushd "$(dirname "$0")/../../"
export SUBSURFACE_SOURCE=$PWD
popd
if [ "$PLATFORM" = "Linux" ] ; then if [ "$PLATFORM" = "Linux" ] ; then
QT_BINARIES=qt-opensource-linux-x64-android-${LATEST_QT}.run QT_BINARIES=qt-opensource-linux-x64-android-${LATEST_QT}.run
NDK_BINARIES=${ANDROID_NDK}-linux-x86_64.zip NDK_BINARIES=${ANDROID_NDK}-linux-x86_64.zip
@ -57,9 +61,8 @@ if [ ! -d Qt ] ; then
if [ ! -f ${QT_BINARIES} ] ; then if [ ! -f ${QT_BINARIES} ] ; then
wget -q ${QT_DOWNLOAD_URL} wget -q ${QT_DOWNLOAD_URL}
fi fi
echo "In the binary installer select $(pwd)/Qt as install directory"
chmod +x ./${QT_BINARIES} chmod +x ./${QT_BINARIES}
./${QT_BINARIES} ./${QT_BINARIES} -platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations
fi fi
# patch the cmake / Qt5.7.1 incompatibility mentioned above # patch the cmake / Qt5.7.1 incompatibility mentioned above