vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fir trailing spaces in version info, add date

Browse source
This commit is contained in:
mittorn 2015-08-20 14:30:16 +07:00
parent a22678fc46
commit d7c89d1d9b
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -28,5 +28,5 @@ script:
- sh gen-version.sh travis build - sh gen-version.sh travis build
- ant debug - ant debug
after_script: after_script:
- curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-a-`date +%d-%m-%y`.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-a-`date +%d-%m-%y`-`git rev-parse --short HEAD`.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

22
gen-version.sh
View file

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