From d7c89d1d9b98032f2b0c07cecd3ff38950cb4884 Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 20 Aug 2015 14:30:16 +0700 Subject: [PATCH] Fir trailing spaces in version info, add date --- .travis.yml | 4 ++-- gen-version.sh | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index e97fd3c4..6d1ac548 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,5 +28,5 @@ script: - 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 - - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-a-`date +%d-%m-%y`-`git rev-parse --short HEAD`.apk + - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d-%H-%M`.apk + - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date +%d-%m-%y`-`git rev-parse --short HEAD`.apk diff --git a/gen-version.sh b/gen-version.sh index 3cc7868b..d080d8ea 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -1,16 +1,18 @@ git update-index --assume-unchanged res/values/git-rev.xml 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) _endl \ -'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 -e s/_endl/'\\n'/ >> res/values/git-rev.xml +echo -n '' >> res/values/git-rev.xml +echo -n 'Version information:'$*_endl| sed -e s/_endl/'\\n'/ >> res/values/git-rev.xml +echo -n 'android:' $(git log --abbrev-commit --pretty=oneline -1) _endl\ +'engine:' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'halflife:' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1)_endl\ + | sed -e s/\'/\\\\\'/g -e s/_endl/'\\n'/g >> res/values/git-rev.xml +echo -n ' ' $USER@$HOSTNAME >> res/values/git-rev.xml +echo -n $(date +%H:%M:%S-%d-%m-%y) >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml cat res/values/git-rev.xml