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

build-system: switch back to upstream qt-android-cmake

Browse source 
And in the process use our script to do the work.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-10-27 10:01:00 -04:00
parent 01cd2e224f
commit 651f63282f
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packaging/android/build.sh
View file

@ -354,14 +354,7 @@ if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] || [ ! -e "$PKG_CONFIG_LIBDIR/libdivec
echo "$CURRENT_SHA" > "libdivecomputer-${ARCH}.SHA" echo "$CURRENT_SHA" > "libdivecomputer-${ARCH}.SHA"
fi fi
if [ ! -e qt-android-cmake ] ; then "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . qt-android-cmake
git clone https://github.com/dirkhh/qt-android-cmake.git
else
pushd qt-android-cmake
git checkout QMLfix
git pull
popd
fi
# the Qt Android cmake addon runs androiddeployqt with '--verbose' which # the Qt Android cmake addon runs androiddeployqt with '--verbose' which
# is, err, rather verbose. Let's not do that. # is, err, rather verbose. Let's not do that.
sed -i -e 's/--verbose//' qt-android-cmake/AddQtAndroidApk.cmake sed -i -e 's/--verbose//' qt-android-cmake/AddQtAndroidApk.cmake

4
scripts/get-dep-lib.sh
View file

@ -17,6 +17,7 @@ CURRENT_KIRIGAMI="8691651c1f0d09430416ba5fe2130647554b06a9"
CURRENT_BREEZE_ICONS="" CURRENT_BREEZE_ICONS=""
CURRENT_GRANTLEE="v5.0.0" CURRENT_GRANTLEE="v5.0.0"
CURRENT_MDBTOOLS="master" CURRENT_MDBTOOLS="master"
CURRENT_QT_ANDROID_CMAKE="master"
# Checkout library from git # Checkout library from git
# Ensure specified version is checked out, # Ensure specified version is checked out,
@ -191,6 +192,9 @@ for package in "${PACKAGES[@]}" ; do
mdbtools) mdbtools)
git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/brianb/mdbtools.git git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/brianb/mdbtools.git
;; ;;
qt-android-cmake)
git_checkout_library qt-android-cmake $CURRENT_QT_ANDROID_CMAKE https://github.com/LaurentGomila/qt-android-cmake.git
;;
*) *)
echo "unknown package \"$package\"" echo "unknown package \"$package\""
exit 1 exit 1