Add git versions to about dialog

.gitignore

@@ -12,3 +12,4 @@ jni/src/MobileTouchControls/MobileTouchControls
 
 local.properties
 
+res/values/git-rev.xml

.travis.yml

@@ -25,6 +25,7 @@ before_install:
   - sed -i -- s/android-8/android-15/g project.properties
 script:
   - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard"
+  - sh gen-version.sh travis build
   - ant debug
 after_script:
   - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-a-`date +%d-%m-%y`.apk

build-test.sh

@@ -4,6 +4,7 @@ DX=./../dx
 APKBUILDER=./../apkbuilder
 mkdir gen
 mkdir bin
+sh gen-version.sh test build
 $AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR
 $JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR:libs/com.bda.controller.jar src/org/libsdl/app/SDLActivity.java src/com/beloko/games/hl/NativeLib.java src/com/beloko/touchcontrols/* gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*  
 $DX --dex --output=bin/classes.dex bin/classes/ libs/com.bda.controller.jar

build.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 SUPPORT_WEBP=false V=1
+sh gen-version.sh default-release
 ant release
 #jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid
 #adb install -r -f bin/xashdroid-debug.apk

debug.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3"
+sh gen-version.sh default-debug
 ant debug
 #jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid -storepass 529459
 adb install -r -f bin/xashdroid-debug.apk

gen-version.sh

@@ -0,0 +1,14 @@
+echo '<?xml version="1.0" encoding="utf-8"?>' > res/values/git-rev.xml
+echo '<resources>' >> res/values/git-rev.xml
+echo '<string name="git_revisions">' >> res/values/git-rev.xml
+echo '<b>Version information:</b>' $* \\n >> res/values/git-rev.xml
+echo '<b>android:</b>' $(git log --abbrev-commit --pretty=oneline -1) \\n \
+'<b>engine:</b>' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) \\n \
+'<b>client:</b>' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) \\n \
+'<b>halflife:</b>' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) \\n \
+'<b>SDL2:</b>' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) \\n \
+'<b>TouchControls:</b>' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) \\n \
+'<b>nanogl:</b>' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1) \\n \
+ | sed -e s/\'/\\\\\'/g >> res/values/git-rev.xml
+echo '</string>' >> res/values/git-rev.xml
+echo '</resources>' >> res/values/git-rev.xml

res/layout/about.xml

@@ -45,6 +45,14 @@
             android:password="false"
             android:longClickable="false"
             android:autoText="false" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="@string/git_revisions"
+            android:id="@+id/textView5"
+            android:autoText="false"
+            android:autoLink="web" />
 
         <TextView
             android:layout_width="wrap_content"

res/values/git-rev.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<string name="git_revisions">No git version information</string>
+</resources>