Ticket #13246: android-version1.patch

android/mythbuild.sh

@@ -260 +260 @@
         for i in $MYTHINSTALLROOT/lib/libmythfilter*.so ; do
                 cp "$i" "$MYTHINSTALLROOT/libs/$ANDROID_TARGET_ARCH/"
         done
+        VERSIONNAME=$(date +"%F" | tr -d '-')-$BUNDLE_NAME-$(grep "define MYTH_SOURCE_VERSION" libs/libmythbase/version.h | cut -d' ' -f 3 | tr -d '"')
+        # Calculate a reasonable versionCode here.
+        VERSIONCODE=300000
+
+        # Setup the real Android versionName and versionCode..
+        sed -e "s/\(android:versionName\)=\"1.0\"/\1=\"$VERSIONNAME\"/" \
+            -e "s/\(android:versionCode\)=\"1\"/\1=\"$VERSIONCODE\"/" \
+            ../../android-package-source/AndroidManifest.xml.in \
+            >../../android-package-source/AndroidManifest.xml
+
         $QTBASE/bin/androiddeployqt \
                 --gradle \
                 --output $INSTALLROOT \
@@ -271 +281 @@
         if [ $? -ne 0 ]; then
                 echo "Error androiddeployqt result is $?"
         else
-                TARGETVERSION=`date +"%F" | tr -d '-'`-$BUNDLE_NAME-`grep "define MYTH_SOURCE_VERSION" libs/libmythbase/version.h | cut -d' ' -f 3 | tr -d '"'`
-                echo "*** copy apk to $BASE/mythfrontend-$TARGETVERSION.apk ***"
+                echo "*** copy apk to $BASE/mythfrontend-$VERSIONNAME.apk ***"
                 for apk in $TARGETAPKPREFIX*.apk; do
-                        cp $apk $BASE/mythfrontend-$TARGETVERSION.apk
+                        cp $apk $BASE/mythfrontend-$VERSIONNAME.apk
                 done
         fi
 }