mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

android: Set version and build for desktop app

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2016-06-23 22:56:33 +02:00 committed by Dirk Hohndel
parent 4ef90638d4
commit 7386d0b5b4
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.subsurfacedivelog" package="org.subsurfacedivelog"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="1" android:versionCode=@BUILD_NR@
android:versionName="1.0" > android:versionName=@SUBSURFACE_VERSION@ >
<application <application
android:name="org.qtproject.qt5.android.bindings.QtApplication" android:name="org.qtproject.qt5.android.bindings.QtApplication"

19
packaging/android/build.sh
View file

@ -363,12 +363,21 @@ sed -i -e "s/-lcrypto//g" CMakeFiles/subsurface-mobile.dir/link.txt
rm -f ssrf-version.h rm -f ssrf-version.h
make version 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 if [ ! -z "$SUBSURFACE_MOBILE" ] ; then
cp -a $SUBSURFACE_SOURCE/android-mobile . SUBSURFACE_MOBILE_VERSION=$(grep MOBILE_VERSION_STRING ssrf-version.h | awk '{ print $3 }' | tr -d \" )
sed -i -e "s/@SUBSURFACE_MOBILE_VERSION@/\"$SUBSURFACE_MOBILE_VERSION\"/;s/@BUILD_NR@/$BUILD_NR/" android-mobile/AndroidManifest.xml 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 # now make the translations
make translations make translations