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 build script: update for Qt 5.9

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-05-31 10:08:56 -07:00
parent 286bac6d30
commit 4e16bd7dce
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,13 +2,16 @@
# run this in the top level folder you want to create Android binaries in # run this in the top level folder you want to create Android binaries in
# #
# it seems that with Qt5.7.1 or Qt5.8 and current cmake there is an odd bug where # it seems that with Qt5.7 (and later) and current cmake there is an odd bug where
# cmake fails reporting :No known features for CXX compiler "GNU". In that # cmake fails reporting :No known features for CXX compiler "GNU". In that
# case simly comment out the "set(property(TARGET Qt5::Core PROPERTY...)" # case simly comment out the "set(property(TARGET Qt5::Core PROPERTY...)"
# at line 101 of # 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 # or at line 95 of
# Qt/5.8/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake # 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 exec 1> >(tee ./build.log) 2>&1
@ -16,8 +19,8 @@ USE_X=$(case $- in *x*) echo "-x" ;; esac)
# these are the current versions for Qt, Android SDK & NDK: # these are the current versions for Qt, Android SDK & NDK:
QT_VERSION=5.8 QT_VERSION=5.9
LATEST_QT=5.8.0 LATEST_QT=5.9.0
NDK_VERSION=r13b NDK_VERSION=r13b
SDK_VERSION=r25.2.3 SDK_VERSION=r25.2.3
@ -31,7 +34,7 @@ export SUBSURFACE_SOURCE=$PWD
popd 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-${LATEST_QT}.run
NDK_BINARIES=${ANDROID_NDK}-linux-x86_64.zip NDK_BINARIES=${ANDROID_NDK}-linux-x86_64.zip
SDK_TOOLS=tools_${SDK_VERSION}-linux.zip SDK_TOOLS=tools_${SDK_VERSION}-linux.zip
else else
@ -64,7 +67,7 @@ if [ ! -d Qt ] ; then
wget -q ${QT_DOWNLOAD_URL} wget -q ${QT_DOWNLOAD_URL}
fi fi
chmod +x ./${QT_BINARIES} chmod +x ./${QT_BINARIES}
./${QT_BINARIES} -platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations ./${QT_BINARIES} --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

2
qt-installer-noninteractive.qs
View file

@ -32,7 +32,7 @@ Controller.prototype.ComponentSelectionPageCallback = function() {
var widget = gui.currentPageWidget(); var widget = gui.currentPageWidget();
widget.selectAll(); widget.selectAll();
widget.deselectComponent('qt.58.src'); widget.deselectComponent('qt.59.src');
gui.clickButton(buttons.NextButton); gui.clickButton(buttons.NextButton);
} }