Conditional test version

.travis.yml

@@ -23,21 +23,21 @@ script:
   - sh gen-config.sh test
   - python2 makepak.py xash-extras assets/extras.pak
   - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard"
-  - ant debug
+  - ant debug -Dtest.version=travis
   - cp bin/xashdroid-debug.apk xashdroid-armv7.apk
   - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi"
-  - ant debug
+  - ant debug -Dtest.version=travis
   - cp bin/xashdroid-debug.apk xashdroid-armv6.apk
   - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86"
-  - ant debug
+  - ant debug -Dtest.version=travis
   - cp bin/xashdroid-debug.apk xashdroid-x86.apk
   - ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean
   - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" CFLAGS_OPT_ARM="-mthumb -mfpu=vfpv3-d16 -mcpu=cortex-a9 -pipe -fPIC"
-  - ant debug
+  - ant debug -Dtest.version=travis
   - cp bin/xashdroid-debug.apk xashdroid-armv7-tegra2.apk
   - ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean
   - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi" CFLAGS_OPT_ARMv5="-marm -march=armv5te -msoft-float -fPIC"
-  - ant debug
+  - ant debug -Dtest.version=travis
   - cp bin/xashdroid-debug.apk xashdroid-armv5.apk
 
 

build.xml

@@ -69,13 +69,18 @@
     <import file="custom_rules.xml" optional="true" />
 
  <!-- allow the package name to be overridden when building -->
-<property name="override.package.name" value="in.celest.xash3d.hl"/>
 <!-- Puts the project's resources into the output package file
 This actually can create multiple resource package in case
 Some custom apk with specific configuration have been
 declared in default.properties.
 -->
 <!-- Replaces the target in tools\ant\build.xml -->
+
+<if>
+<condition>
+<isset property="test.version"/>
+</condition>
+<then>
 <target name="-package-resources" depends="-crunch">
             <!-- this exec replicates the output of the aapt task in build.xml
                  -package-resources with the addition of a rename-manifest-package option. -->
@@ -83,8 +88,10 @@ declared in default.properties.
                 <arg value="package" />
                 <arg value="-f" />
                 <arg value="--auto-add-overlay" />
+                <arg value="--app-version-name" />
+                <arg value="${test.version}" />
                 <arg value="-M" />
-                <arg path="${basedir}/AndroidManifest.xml" />
+                <arg path="${basedir}/test/AndroidManifest.xml" />
                 <arg value="-S" />
                 <arg path="${basedir}/test/res" />
                 <arg value="-A" />
@@ -97,6 +104,8 @@ declared in default.properties.
                 <arg value="in.celest.xash3d.hl.test" />
             </exec>
 </target>
+</then>
+</if>
     <!-- Import the actual build file.
 
          To customize existing targets, there are two options:

travis-upload.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+\#!/bin/sh
 
 # Upload travis generated APKs to the Transfer.sh and Yandex.Disk
 
@@ -21,8 +21,8 @@ FILE_BASE=${FNAME%.*}
 FILE_EXT="${FNAME##*.}"
 OUTNAME=$PREFIX-$FILE_BASE-$POSTFIX.$FILE_EXT
 echo $FNAME: `curl --upload-file $FNAME https://transfer.sh/$OUTNAME`
-curl -T $FNAME -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$OUTNAME
+curl -T $FNAME -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$OUTNAME > /dev/null
-curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/current-$FILE_BASE-$TRAVIS_BRANCH.$FILE_EXT
+curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/current-$FILE_BASE-$TRAVIS_BRANCH.$FILE_EXT > /dev/null
 shift
 done
 exit 0