ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify setting android project version

Browse Source
This commit is contained in:
Deve 2018-04-19 21:05:27 +02:00
parent b07a345b1c
commit fdea04f34c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/make.sh
View File

@ -239,10 +239,8 @@ if [ -f "$DIRNAME/obj/project_version" ]; then
if [ -z "$PROJECT_VERSION" ]; then if [ -z "$PROJECT_VERSION" ]; then
PROJECT_VERSION="$PROJECT_VERSION_PREV" PROJECT_VERSION="$PROJECT_VERSION_PREV"
elif [ "$PROJECT_VERSION" != "$PROJECT_VERSION_PREV" ]; then elif [ "$PROJECT_VERSION" != "$PROJECT_VERSION_PREV" ]; then
echo "Error: Compilation of different version has been already made." echo "Different project version has been set. Forcing recompilation..."
echo "Run './make.sh clean' first or set PROJECT_VERSION variable" \ touch -c "$DIRNAME/Android.mk"
"to '$PROJECT_VERSION_PREV.'"
exit
fi fi
fi fi
@ -273,9 +271,7 @@ if [ -d "$DIRNAME/assets/data" ]; then
fi fi
fi fi
if [ ! -f "$DIRNAME/obj/project_version" ]; then echo "$PROJECT_VERSION" > "$DIRNAME/obj/project_version"
echo "$PROJECT_VERSION" > "$DIRNAME/obj/project_version"
fi
# Standalone toolchain # Standalone toolchain