Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
est31 2015-07-31 04:51:57 +02:00
parent 05fe9ab2d4
commit 7217fd32eb
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build/android/Makefile
View File

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