diff options
| author | sapier <Sapier at GMX dot net> | 2014-07-16 20:01:00 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-07-16 20:01:00 +0200 |
| commit | d38f6ebb9bb9ff201b3a1e19a8e6ad311dbe4972 (patch) | |
| tree | 72e4823f34c274519c92f882f2297dede6536b0b /build | |
| parent | 7d72ac6a6954e25d635795e099fbe51e4a668df9 (diff) | |
| download | minetest-d38f6ebb9bb9ff201b3a1e19a8e6ad311dbe4972.tar.gz minetest-d38f6ebb9bb9ff201b3a1e19a8e6ad311dbe4972.tar.bz2 minetest-d38f6ebb9bb9ff201b3a1e19a8e6ad311dbe4972.zip | |
Fix error handling on inconsistent client ready message
Fix android makefile to provide a correct dummy githash if detection fails
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 38a3cbb0e..6528e839c 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -691,7 +691,11 @@ $(ROOT)/jni/src/android_version.h : echo "#define VERSION_PATCH_ORIG $$(cat ${ROOT}/../../CMakeLists.txt | \ grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')" \ >> ${ROOT}/jni/src/android_version.h; \ - echo "#define CMAKE_VERSION_GITHASH \"$$(git rev-parse --short=8 HEAD)\"" \ + export GITHASH=$$(git rev-parse --short=8 HEAD); \ + if [ "x$$GITHASH" = "x" ] ; then \ + export GITHASH=gUnknown; \ + fi; \ + echo "#define CMAKE_VERSION_GITHASH \"$$GITHASH\"" \ >> ${ROOT}/jni/src/android_version.h; \ echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\ \".\"STR(VERSION_PATCH)" \ |