From 391546536c0a6866a8c2fe3507fa0c8082b2fb48 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Sun, 7 Oct 2018 00:30:32 +0200 Subject: [PATCH] Merged versioning --- CMakeLists.txt | 33 ++-------- scripts/mg-version-synch.sh | 124 ------------------------------------ scripts/mg-version.sh | 24 ------- 3 files changed, 4 insertions(+), 177 deletions(-) delete mode 100755 scripts/mg-version-synch.sh delete mode 100755 scripts/mg-version.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 138d9ef40..12d4f7771 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,35 +47,10 @@ MESSAGE(STATUS "================================================================ SET(PKG_NAME "zetaglest") # read version -FILE(READ ${PROJECT_SOURCE_DIR}/source/glest_game/facilities/game_util.cpp ZG_VERSION_H_CONTENTS) -MESSAGE(STATUS "Determining version number system type to use:") -SET(Begin_otv_string "string glestVersionString") -STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)(\\.)([^\\.]*)(\\.)([^\"\\.;]*)\";" _threePartMatch "${ZG_VERSION_H_CONTENTS}") -STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)(\\.)([^\"\\.;]*)\";" _twoPartMatch "${ZG_VERSION_H_CONTENTS}") -STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\"\\.;]*)\";" _onePartMatch "${ZG_VERSION_H_CONTENTS}") -IF(_threePartMatch) - MESSAGE(STATUS "** Trying 3 part versioning ") - STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)\\.[^\\.]*\\..*" "\\1" VER_MAJOR "${_threePartMatch}") - STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*[0-9][^\\.]*\\.([^\\.]*)\\..*" "\\1" VER_MINOR "${_threePartMatch}") - STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*[0-9][^\\.]*\\.[^\\.]*\\.([^\"\\.;]*).*" "\\1" VER_PATCH "${_threePartMatch}") - SET(ZETAGLEST_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") -ELSEIF(_twoPartMatch) - MESSAGE(STATUS "** Trying 2 part versioning ") - STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)\\..*" "\\1" VER_MAJOR "${_twoPartMatch}") - STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*[0-9][^\\.]*\\.([^\"\\.;]*).*" "\\1" VER_MINOR "${_twoPartMatch}") - SET(VER_PATCH "0") - SET(ZETAGLEST_VERSION "${VER_MAJOR}.${VER_MINOR}") -ELSEIF(_onePartMatch) - MESSAGE(STATUS "** Trying 1 part versioning ") - STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\"\\.;]*).*" "\\1" VER_MAJOR "${_onePartMatch}") - SET(VER_MINOR "0") - SET(VER_PATCH "0") - SET(ZETAGLEST_VERSION "${VER_MAJOR}") -ENDIF() -FOREACH(ver_var VER_MAJOR;VER_MINOR;VER_PATCH;ZETAGLEST_VERSION) - STRING(REGEX REPLACE "[ \t]" "" "${ver_var}" "${${ver_var}}") -ENDFOREACH() -MESSAGE(STATUS "Detected ZetaGlest Version is [v${ZETAGLEST_VERSION}] ") +FILE(READ ${PROJECT_SOURCE_DIR}/source/version.txt ZG_VERSION) +string(STRIP "${ZG_VERSION}" ZG_VERSION) +MESSAGE(STATUS "Detected ZetaGlest Version is [v${ZG_VERSION}] ") +add_definitions(-DZG_VERSION=\"${ZG_VERSION}\") SET(PIC_FLAG "${PIC_FLAG} -fPIC") IF(WANT_STATIC_LIBS AND "${CMAKE_SIZEOF_VOID_P}" EQUAL "8") diff --git a/scripts/mg-version-synch.sh b/scripts/mg-version-synch.sh deleted file mode 100755 index 5a4ac7316..000000000 --- a/scripts/mg-version-synch.sh +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh -# Use this script to synchronize other scripts and installers with the version -# in mg-version.sh for a Version Release -# ---------------------------------------------------------------------------- -# Written by Mark Vejvoda -# Copyright (c) 2011-2015 Mark Vejvoda under GNU GPL v3.0+ - -CURRENTDIR="$(dirname "$(readlink -f "$0")")" -cd "$CURRENTDIR" -CURRENT_VERSION=`./mg-version.sh --version` -OLD_VERSION=`./mg-version.sh --oldversion_binary` -VERSION_INFO_FILE="$(dirname "$(readlink -f "$0")")/../../source/version.txt" -LastCompatibleSaveGameVersion="$(awk -F '=' '/^LastCompatibleSaveGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" -CurrYear="$(date +%y)" -MapeditorVersion="$CURRENT_VERSION" -G3dviewerVersion="$CURRENT_VERSION" -modifymore="yes" -echo -echo '===== Updating Game ======' -# const string glestVersionString = "v3.12-dev"; -echo 'Game version # before:' -grep -E '^const string glestVersionString = "[^"]*";$' ../../source/glest_game/facilities/game_util.cpp -sed -i 's/^const string glestVersionString = "[^"]*";$/const string glestVersionString = "v'$CURRENT_VERSION'";/' ../../source/glest_game/facilities/game_util.cpp -echo 'Game version # after:' -grep -E '^const string glestVersionString = "[^"]*";$' ../../source/glest_game/facilities/game_util.cpp -echo -echo 'Game Copyright date # before:' -grep -E 'Copyright 2010-20[0-9][0-9] The MegaGlest Team' ../../source/glest_game/facilities/game_util.cpp -sed -i 's/Copyright 2010-20[0-9][0-9] The MegaGlest Team/Copyright 2010-20'$CurrYear' The MegaGlest Team/' ../../source/glest_game/facilities/game_util.cpp -grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macos/bundle_resources/Info.plist.in -sed -i 's/© 2001-20[0-9][0-9] The MegaGlest Team/© 2001-20'$CurrYear' The MegaGlest Team/' ../../mk/macos/bundle_resources/Info.plist.in -echo 'Game Copyright date # after:' -grep -E 'Copyright 2010-20[0-9][0-9] The MegaGlest Team' ../../source/glest_game/facilities/game_util.cpp -grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macos/bundle_resources/Info.plist.in -echo -if [ "$modifymore" = "yes" ]; then - # const string lastCompatibleSaveGameVersionString = "v3.9.0"; - echo 'Compatible Save Game version # before:' - grep -E '^const string lastCompatibleSaveGameVersionString = "[^"]*";$' ../../source/glest_game/facilities/game_util.cpp - sed -i 's/^const string lastCompatibleSaveGameVersionString = "[^"]*";$/const string lastCompatibleSaveGameVersionString = "v'$LastCompatibleSaveGameVersion'";/' ../../source/glest_game/facilities/game_util.cpp - echo 'Compatible Save Game version # after:' - grep -E '^const string lastCompatibleSaveGameVersionString = "[^"]*";$' ../../source/glest_game/facilities/game_util.cpp - echo -fi -if [ "$modifymore" = "yes" ] && [ "$(git status >/dev/null 2>&1; echo "$?")" -eq "0" ]; then - # const string GIT_RawRev = "$4446.1a8673f$"; - GitCommitForRelease="`git rev-list HEAD --count`.`git log -1 --format=%h --abbrev=7`"; - echo 'GitCommitForRelease # before:' - grep -E '^GitCommitForRelease = "[^"]*";$' "$VERSION_INFO_FILE" - grep -E '^ const string GIT_RawRev = "\$[^"$]*\$";$' ../../source/glest_game/facilities/game_util.cpp - sed -i 's/^GitCommitForRelease = "[^"]*";$/GitCommitForRelease = "'$GitCommitForRelease'";/' "$VERSION_INFO_FILE" - sed -i 's/^ const string GIT_RawRev = "$[^"]*";$/ const string GIT_RawRev = "$'$GitCommitForRelease'$";/' ../../source/glest_game/facilities/game_util.cpp - echo 'GitCommitForRelease # after:' - grep -E '^GitCommitForRelease = "[^"]*";$' "$VERSION_INFO_FILE" - grep -E '^ const string GIT_RawRev = "\$[^"$]*\$";$' ../../source/glest_game/facilities/game_util.cpp -fi -echo -if [ "$modifymore" = "yes" ]; then - echo '===== Updating Mapeditor ======' - # const string mapeditorVersionString = "v1.6.1"; - echo 'Mapeditor version # before:' - grep -E '^const string mapeditorVersionString = "[^"]*";$' ../../source/glest_map_editor/main.cpp - sed -i 's/^const string mapeditorVersionString = "[^"]*";$/const string mapeditorVersionString = "v'$MapeditorVersion'";/' ../../source/glest_map_editor/main.cpp - echo 'Mapeditor version # after:' - grep -E '^const string mapeditorVersionString = "[^"]*";$' ../../source/glest_map_editor/main.cpp - echo - echo 'Mapeditor Copyright date # before:' - grep -E 'Copyright 2010-20[0-9][0-9] The MegaGlest Team' ../../source/glest_map_editor/main.cpp - sed -i 's/Copyright 2010-20[0-9][0-9] The MegaGlest Team/Copyright 2010-20'$CurrYear' The MegaGlest Team/' ../../source/glest_map_editor/main.cpp - echo 'Mapeditor Copyright date # after:' - grep -E 'Copyright 2010-20[0-9][0-9] The MegaGlest Team' ../../source/glest_map_editor/main.cpp - echo - echo '===== Updating G3dviewer ======' - # const string g3dviewerVersionString= "v1.3.6"; - echo 'G3dviewer version # before:' - grep -E '^const string g3dviewerVersionString= "[^"]*";$' ../../source/g3d_viewer/main.cpp - sed -i 's/^const string g3dviewerVersionString= "[^"]*";$/const string g3dviewerVersionString= "v'$G3dviewerVersion'";/' ../../source/g3d_viewer/main.cpp - echo 'G3dviewer version # after:' - grep -E '^const string g3dviewerVersionString= "[^"]*";$' ../../source/g3d_viewer/main.cpp -fi -echo -echo '===== Updating Linux Installer ======' -# local GAME_VERSION = "x.x.x"; -echo 'Linux Installer version # before:' -grep -E '^local GAME_VERSION = "[^"]*";$' tools-for-standalone-client/installer/scripts/config.lua -sed -i 's/^local GAME_VERSION = "[^"]*";$/local GAME_VERSION = "'$CURRENT_VERSION'";/' tools-for-standalone-client/installer/scripts/config.lua -echo 'Linux Installer version # after:' -grep -E '^local GAME_VERSION = "[^"]*";$' tools-for-standalone-client/installer/scripts/config.lua -echo -echo '===== Updating Windows Installer ======' -# !define APVER 3.6.0 -echo 'Windows Installer version # before:' -grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi -sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windows/Installer/MegaGlestInstaller.nsi -echo 'Windows Installer version # after:' -grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi -echo -if [ "$modifymore" = "yes" ]; then - echo 'Windows Installer version # before:' - grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi - sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windows/Installer/MegaGlestInstaller.nsi - echo 'Windows Installer version # after:' - grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi - echo - echo '===== Updating Windows Updater ======' - echo 'Windows Updater version # before:' - grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi - sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windows/Installer/MegaGlestUpdater.nsi - echo 'Windows Updater version # after:' - grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi - echo - echo 'Windows Updater version # before:' - grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi - sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windows/Installer/MegaGlestUpdater.nsi - echo 'Windows Updater version # after:' - grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi - echo - echo 'Windows Updater version # before:' - grep -E '^\!define APVER_UPDATE [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi - sed -i 's/^\!define APVER_UPDATE [^"]*$/\!define APVER_UPDATE '$CURRENT_VERSION'/' ../windows/Installer/MegaGlestUpdater.nsi - echo 'Windows Updater version # after:' - grep -E '^\!define APVER_UPDATE [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi - echo -fi diff --git a/scripts/mg-version.sh b/scripts/mg-version.sh deleted file mode 100755 index 53a0d3e0b..000000000 --- a/scripts/mg-version.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Use this script to idenitfy previous and current Version for a Version Release -# ---------------------------------------------------------------------------- -# Written by Mark Vejvoda -# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ - -KERNEL="$(uname -s | tr '[A-Z]' '[a-z]')" -if [ "$KERNEL" = "darwin" ]; then - CURRENTDIR="$(cd "$(dirname "$0")"; pwd)" -else - CURRENTDIR="$(dirname "$(readlink -f "$0")")" -fi -VERSION_INFO_FILE="$CURRENTDIR/../../source/version.txt" -OLD_MG_VERSION="$(awk -F '=' '/^OldReleaseGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" -OLD_MG_VERSION_BINARY="$OLD_MG_VERSION" -MG_VERSION="$(awk -F '=' '/^CurrentGameVersion =/ {print $2}' "$VERSION_INFO_FILE" | awk -F '"' '{print $2}')" - -if [ "$1" = "--oldversion" ]; then - echo "$OLD_MG_VERSION" -elif [ "$1" = "--oldversion_binary" ]; then - echo "$OLD_MG_VERSION_BINARY" -elif [ "$1" = "--version" ]; then - echo "$MG_VERSION" -fi