diff --git a/config.pri b/config.pri index 091ed17e..dc183355 100644 --- a/config.pri +++ b/config.pri @@ -5,6 +5,10 @@ QMAKE_CXXFLAGS += -Wall top_srcdir=$$PWD top_builddir=$$shadowed($$PWD) -APP_VERSION=$$cat(version.txt) +VERSION_INFO=$$cat(version.txt) +APP_VERSION=$$member(VERSION_INFO, 0) +APP_REVISION=$$member(VERSION_INFO, 1) +message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})") + DEFINES+=APP_VERSION=\\\"$${APP_VERSION}\\\" android:QMAKE_POST_LINK += cp $$top_srcdir/version.txt $$top_builddir/ diff --git a/packaging/android/gradlew b/packaging/android/gradlew index 8a0fc299..6c4c6a0e 100755 --- a/packaging/android/gradlew +++ b/packaging/android/gradlew @@ -1,7 +1,9 @@ #!/bin/sh BASEDIR=$(dirname "$0") -MEA_VERSION=`cat $BASEDIR/../version.txt` -echo "Setting version to $MEA_VERSION" +MEA_VERSION=`cat $BASEDIR/../version.txt | head -n 1` +MEA_VERSION_CODE=`cat $BASEDIR/../version.txt | head -n 2 | tail -n 1` +echo "Setting version to $MEA_VERSION ($MEA_VERSION_CODE)" sed -i "s/android:versionName=\"[0-9\.a-zA-Z$_]*\"/android:versionName=\"$MEA_VERSION\"/" AndroidManifest.xml +sed -i "s/android:versionCode=\"[0-9]*\"/android:versionCode=\"$MEA_VERSION_CODE\"/" AndroidManifest.xml ./gradlew.upstream $@ diff --git a/version.txt b/version.txt index 28dff432..17580656 100644 --- a/version.txt +++ b/version.txt @@ -1 +1,2 @@ 1.0.35 +1