Fix 0.4.11 githash for android

Also make only one >-redirection, sparing repetition.
Also, use cut instead of awk, which is shorter and should be a bit faster.

diff --git a/build/android/Makefile b/build/android/Makefile
index 295ddf620aea98573950510c1e1ff16abe9b22be..0a70c189a2cd17d9ab10633a1cf32231bbddd072 100644 (file)
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -819,28 +819,26 @@ clean_all :
        $(RM) -r gen libs obj deps bin Debug and_env
 
 $(ROOT)/jni/src/android_version.h :
-       @echo "#ifndef ANDROID_MT_VERSION_H"                                       \
-       >${ROOT}/jni/src/android_version.h;                                        \
-       echo "#define ANDROID_MT_VERSION_H"                                        \
-       >> ${ROOT}/jni/src/android_version.h;                                      \
-       echo "#define VERSION_MAJOR $$(cat ${ROOT}/../../CMakeLists.txt |          \
-       grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}')"            \
-       >> ${ROOT}/jni/src/android_version.h;                                      \
-       echo "#define VERSION_MINOR $$(cat ${ROOT}/../../CMakeLists.txt |          \
-       grep ^set\(VERSION_MINOR\ | sed 's/)/ /' | awk '{print $$2;}')"            \
-       >> ${ROOT}/jni/src/android_version.h;                                      \
-       echo "#define VERSION_PATCH $$(cat ${ROOT}/../../CMakeLists.txt |          \
-       grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')"            \
-       >> ${ROOT}/jni/src/android_version.h;                                      \
+       @ {                                                                        \
+       echo "#ifndef ANDROID_MT_VERSION_H";                                       \
+       echo "#define ANDROID_MT_VERSION_H";                                       \
+       export CMAKE_FILE=${ROOT}/../../CMakeLists.txt;                            \
+       export VERSION_MAJOR=$$(cat $${CMAKE_FILE} |                               \
+       grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | cut -f2 -d' ');                 \
+       export VERSION_MINOR=$$(cat $${CMAKE_FILE} |                               \
+       grep ^set\(VERSION_MINOR\ | sed 's/)/ /' | cut -f2 -d' ');                 \
+       export VERSION_PATCH=$$(cat $${CMAKE_FILE} |                               \
+       grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | cut -f2 -d' ');                 \
+       echo "#define VERSION_MAJOR $${VERSION_MAJOR}";                            \
+       echo "#define VERSION_MINOR $${VERSION_MINOR}";                            \
+       echo "#define VERSION_PATCH $${VERSION_PATCH}";                            \
        export GITHASH=$$(git rev-parse --short=8 HEAD);                           \
-       export GITTAG=$$(git describe --abbrev=0 --tags);                          \
-       echo "#define VERSION_GITHASH \"$$GITTAG-$$GITHASH-Android\""              \
-       >> ${ROOT}/jni/src/android_version.h;                                      \
+       export VERSION_STR="$${VERSION_MAJOR}.$${VERSION_MINOR}.$${VERSION_PATCH}";\
+       echo "#define VERSION_GITHASH \"$$VERSION_STR-$$GITHASH-Android\"";        \
        echo "#define VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\
-       \".\"STR(VERSION_PATCH)"                                                   \
-       >> ${ROOT}/jni/src/android_version.h;                                      \
-       echo "#endif"                                                              \
-       >> ${ROOT}/jni/src/android_version.h;
+       \".\"STR(VERSION_PATCH)";                                                  \
+       echo "#endif";                                                             \
+       } > ${ROOT}/jni/src/android_version.h
 
 manifest :
        @VERS_MAJOR=$$(cat ${ROOT}/../../CMakeLists.txt |                          \