diff --git a/docs/README.release-management.txt b/docs/README.release-management.txt index 8f261a887..bce6350ff 100644 --- a/docs/README.release-management.txt +++ b/docs/README.release-management.txt @@ -16,10 +16,9 @@ checked out for that specific release (example, tag: 3.11.0) or downloaded all source archives/"tarballs" which in their name have same version, equal to tag. To set the current version for release, modify the file source/version.txt -and change there available variables. -During build (on linux by script build-mg.sh) version number will be updated -automatically everywhere where it is needed. -Then you only have to commit changed files. +and change there available variables, then run mk/linux/mg-version-synch.sh script +for updating version number everywhere where it is needed and then you only have +to commit changed files. #1. The source archive: This archive contains source code for binary compilation of the application and diff --git a/mk/linux/build-mg.sh b/mk/linux/build-mg.sh index 9b68bb0ad..cd85c5c62 100755 --- a/mk/linux/build-mg.sh +++ b/mk/linux/build-mg.sh @@ -89,7 +89,6 @@ CLANG_BIN_PATH=$( which clang 2>/dev/null ) CLANGPP_BIN_PATH=$( which clang++ 2>/dev/null ) cd ${SCRIPTDIR} -./mg-version-synch.sh >/dev/null # Google breakpad integration (cross platform memory dumps) - OPTIONAL # Set this to the root path of your Google breakpad subversion working copy. diff --git a/mk/linux/mg-version-synch.sh b/mk/linux/mg-version-synch.sh index 3e646dc64..947864237 100755 --- a/mk/linux/mg-version-synch.sh +++ b/mk/linux/mg-version-synch.sh @@ -11,7 +11,8 @@ VERSION_INFO_FILE="$(dirname "$(readlink -f "$0")")/../../source/version.txt" LastCompatibleSaveGameVersion="$(awk -F '=' '/^LastCompatibleSaveGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" MapeditorVersion="$(awk -F '=' '/^MapeditorVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" G3dviewerVersion="$(awk -F '=' '/^G3dviewerVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" -if [ "$(echo "$CURRENT_VERSION" | grep -v [a-zA-Z])" != "" ]; then modifymore="yes"; else modifymore="no"; fi +#if [ "$(echo "$CURRENT_VERSION" | grep -v [a-zA-Z])" != "" ]; then modifymore="yes"; else modifymore="no"; fi +modifymore="yes" echo echo '===== Updating Game ======' # const string glestVersionString = "v3.12-dev"; diff --git a/source/version.txt b/source/version.txt index f116b51a2..ab19547b6 100644 --- a/source/version.txt +++ b/source/version.txt @@ -1,11 +1,7 @@ # How it currently works? -# Set version here (only here) and just start build on linux. Versions will be -# updated everywhere automatically, but if CurrentGameVersion is a "dev" then -# only game version will be automatically updated (saving time during rebuild -# and for cleaner "git status"). -# -# Then you should on the occasion commit changed files (this step should/will -# disappear someday, during later improvements). +# Set version here (only here) and just start mk/linux/mg-version-synch.sh script. +# Versions will be updated everywhere automatically. +# Then you should commit changed files and that's all. CurrentGameVersion = "3.12-dev"; # ^ typical version numbers look like this: "3.11-beta1.0", "3.12-dev", "3.12.0"