From 6be08007042bb54fdacaf8430a5f6b10b075fee7 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 10 Mar 2016 06:28:20 -0800 Subject: [PATCH] Update Subsurface-mobile version to 1.0.0 And make sure the version displayed for Android includes both that version and the build version, which is our regular canonical 4 part version number - so this release will be something like "1.0.0 (4.5.2.1047)" Signed-off-by: Dirk Hohndel --- cmake/Modules/version.cmake | 2 +- packaging/android/build.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/version.cmake b/cmake/Modules/version.cmake index dcff01d74..10d451127 100644 --- a/cmake/Modules/version.cmake +++ b/cmake/Modules/version.cmake @@ -10,7 +10,7 @@ execute_process( OUTPUT_VARIABLE CANONICAL_VERSION_STRING OUTPUT_STRIP_TRAILING_WHITESPACE ) -set(MOBILE_VERSION_STRING "0.93") +set(MOBILE_VERSION_STRING "1.0.0") configure_file(${SRC} ${DST} @ONLY) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 3ca68eb2d..788e00231 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -355,10 +355,13 @@ cmake $MOBILE_CMAKE \ 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 }" ) + +SUBSURFACE_MOBILE_VERSION=$(grep MOBILE_VERSION_STRING ssrf-version.h | awk '{ print $3 }' | tr -d \" ) +SUBSURFACE_MOBILE_VERSION="${SUBSURFACE_MOBILE_VERSION} ($(grep CANONICAL_VERSION_STRING ssrf-version.h | awk '{ print $3 }' | tr -d \"))" + rm -rf android-mobile cp -a $SUBSURFACE_SOURCE/android-mobile . -sed -i -e "s/@SUBSURFACE_MOBILE_VERSION@/$SUBSURFACE_MOBILE_VERSION/;s/@BUILD_NR@/$BUILD_NR/" android-mobile/AndroidManifest.xml +sed -i -e "s/@SUBSURFACE_MOBILE_VERSION@/\"$SUBSURFACE_MOBILE_VERSION\"/;s/@BUILD_NR@/$BUILD_NR/" android-mobile/AndroidManifest.xml # now build Subsurface and use the rest of the command line arguments make $@