From fdea04f34cd99524ace0eccffc984a5a8fe40180 Mon Sep 17 00:00:00 2001 From: Deve Date: Thu, 19 Apr 2018 21:05:27 +0200 Subject: [PATCH] Simplify setting android project version --- android/make.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/android/make.sh b/android/make.sh index 8dbac3e11..f79d018d5 100755 --- a/android/make.sh +++ b/android/make.sh @@ -239,10 +239,8 @@ if [ -f "$DIRNAME/obj/project_version" ]; then if [ -z "$PROJECT_VERSION" ]; then PROJECT_VERSION="$PROJECT_VERSION_PREV" elif [ "$PROJECT_VERSION" != "$PROJECT_VERSION_PREV" ]; then - echo "Error: Compilation of different version has been already made." - echo "Run './make.sh clean' first or set PROJECT_VERSION variable" \ - "to '$PROJECT_VERSION_PREV.'" - exit + echo "Different project version has been set. Forcing recompilation..." + touch -c "$DIRNAME/Android.mk" fi fi @@ -273,9 +271,7 @@ if [ -d "$DIRNAME/assets/data" ]; then fi fi -if [ ! -f "$DIRNAME/obj/project_version" ]; then - echo "$PROJECT_VERSION" > "$DIRNAME/obj/project_version" -fi +echo "$PROJECT_VERSION" > "$DIRNAME/obj/project_version" # Standalone toolchain