From 7386d0b5b4dbfbc10434a51febd048e564c34408 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Thu, 23 Jun 2016 22:56:33 +0200 Subject: android: Set version and build for desktop app Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- packaging/android/build.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'packaging/android/build.sh') diff --git a/packaging/android/build.sh b/packaging/android/build.sh index a035d63c0..5c99c7b21 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -363,12 +363,21 @@ sed -i -e "s/-lcrypto//g" CMakeFiles/subsurface-mobile.dir/link.txt rm -f ssrf-version.h make version -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 +if [ ! -z "$SUBSURFACE_MOBILE" ] ; then + 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 +else + SUBSURFACE_VERSION=$(grep CANONICAL_VERSION_STRING ssrf-version.h | awk '{ print $3 }' | tr -d \") + + rm -rf android + cp -a $SUBSURFACE_SOURCE/android . + sed -i -e "s/@SUBSURFACE_VERSION@/\"$SUBSURFACE_VERSION\"/;s/@BUILD_NR@/$BUILD_NR/" android/AndroidManifest.xml +fi # now make the translations make translations -- cgit v1.2.3-70-g09d2