diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-03-05 17:14:33 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-03-05 17:14:33 -0800 |
| commit | a64eef7f82a69652a56f2a4c752c1e9cb533694e (patch) | |
| tree | 18786c960571793424dd61a115e5dd4df430c721 | |
| parent | d42b7f55c4e0aea004a2ba7ba135c173f3615290 (diff) | |
| download | subsurface-a64eef7f82a69652a56f2a4c752c1e9cb533694e.tar.gz | |
Android build: automate setting the right version number
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | android-mobile/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packaging/android/build.sh | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 13f34fd00..c636d1f36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,9 +325,8 @@ endforeach() if(ANDROID) # Android template directory include(${QT_ANDROID_CMAKE}) - set(ANDROID_PACKAGE_SOURCE_DIR, ${CMAKE_BINARY_DIR}/android-mobile) add_qt_android_apk(${SUBSURFACE_TARGET}.apk ${SUBSURFACE_TARGET} - PACKAGE_SOURCES ${CMAKE_CURRENT_LIST_DIR}/android-mobile + PACKAGE_SOURCES ${CMAKE_BINARY_DIR}/android-mobile ) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(APP_BUNDLE_DIR "${SUBSURFACE_TARGET}.app") diff --git a/android-mobile/AndroidManifest.xml b/android-mobile/AndroidManifest.xml index e598303d0..e597a6ccd 100644 --- a/android-mobile/AndroidManifest.xml +++ b/android-mobile/AndroidManifest.xml @@ -3,7 +3,7 @@ package="org.subsurfacedivelog.mobile" android:installLocation="auto" android:versionCode="1" - android:versionName="1.0" > + android:versionName=@SUBSURFACE_MOBILE_VERSION@ > <application android:name="org.qtproject.qt5.android.bindings.QtApplication" diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 03c2ddae9..7b522b5df 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -348,6 +348,12 @@ cmake $MOBILE_CMAKE \ # libcrypto - that's not helpful sed -i -e "s/-lcrypto//g" CMakeFiles/subsurface-mobile.dir/link.txt +# set up the version number +SUBSURFACE_MOBILE_VERSION=$(grep MOBILE_VERSION_STRING ssrf-version.h | awk "{ print \$3 }" ) +rm -rf android-mobile +cp -a $SUBSURFACE_SOURCE/android-mobile . +sed -i -e "s/@SUBSURFACE_MOBILE_VERSION@/$SUBSURFACE_MOBILE_VERSION/" android-mobile/AndroidManifest.xml + # now build Subsurface and use the rest of the command line arguments make $@ |