diff --git a/.gitignore b/.gitignore index 9e679227..082b81f9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ jni/src/MobileTouchControls/MobileTouchControls local.properties +res/values/git-rev.xml diff --git a/.travis.yml b/.travis.yml index 7934b178..e97fd3c4 100644 --- a/.travis.yml +++ b/.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 diff --git a/build-test.sh b/build-test.sh index ba14de6d..92c35655 100644 --- a/build-test.sh +++ b/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 diff --git a/build.sh b/build.sh index 70eb6c3f..8e2c4795 100755 --- a/build.sh +++ b/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 diff --git a/debug.sh b/debug.sh index 4a895508..d8929ca3 100755 --- a/debug.sh +++ b/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 diff --git a/gen-version.sh b/gen-version.sh new file mode 100755 index 00000000..b7c5c645 --- /dev/null +++ b/gen-version.sh @@ -0,0 +1,14 @@ +echo '' > res/values/git-rev.xml +echo '' >> res/values/git-rev.xml +echo '' >> res/values/git-rev.xml +echo 'Version information:' $* \\n >> res/values/git-rev.xml +echo 'android:' $(git log --abbrev-commit --pretty=oneline -1) \\n \ +'engine:' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'halflife:' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ + | sed -e s/\'/\\\\\'/g >> res/values/git-rev.xml +echo '' >> res/values/git-rev.xml +echo '' >> res/values/git-rev.xml diff --git a/res/layout/about.xml b/res/layout/about.xml index d935c01a..0ad3470b 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -45,6 +45,14 @@ android:password="false" android:longClickable="false" android:autoText="false" /> + + +No git version information +