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: cleanup build wrapper script

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2018-12-22 09:45:33 -08:00
parent b0e81ff978
commit f39b07dec3
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,8 @@ while [[ $# -gt 0 ]] ; do
done done
# these are the current versions for Qt, Android SDK & NDK: # 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 # avoid timeouts on Travis when downloads take a long time
SLOW_PROG="" SLOW_PROG=""
@ -51,9 +52,7 @@ fi
PLATFORM=$(uname) PLATFORM=$(uname)
pushd $(dirname "$0")/../../ export SUBSURFACE_SOURCE="$SCRIPTDIR"/../..
export SUBSURFACE_SOURCE=$PWD
popd
if [ "$PLATFORM" = Linux ] ; then if [ "$PLATFORM" = Linux ] ; then
QT_BINARIES=qt-opensource-linux-x64-${LATEST_QT}.run 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}" $SLOW_PROG 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}" --platform minimal --script "$SCRIPTDIR"/qt-installer-noninteractive.qs --no-force-installations -v
fi fi
# patch the cmake / Qt5.7.1 incompatibility mentioned above # 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 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 exit 0
fi fi

0
qt-installer-noninteractive.qs → packaging/android/qt-installer-noninteractive.qs
View file