From 4548c6ebb879189f21b51c27696227333a8fa035 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 16 Dec 2011 09:04:26 +0000 Subject: [PATCH] - updated scripts to make release easier. - incremented version to 3.6.0.2 --- mk/linux/mg-version-synch.sh | 32 +++++++++++++++++++ mk/linux/mg-version.sh | 3 ++ .../megaglest-installer/scripts/config.lua | 2 +- mk/windoze/Installer/MegaGlestInstaller.nsi | 4 +-- mk/windoze/Installer/MegaGlestUpdater.nsi | 6 ++-- source/glest_game/facilities/game_util.cpp | 2 +- 6 files changed, 42 insertions(+), 7 deletions(-) diff --git a/mk/linux/mg-version-synch.sh b/mk/linux/mg-version-synch.sh index a848fda30..75863f8f5 100755 --- a/mk/linux/mg-version-synch.sh +++ b/mk/linux/mg-version-synch.sh @@ -6,8 +6,40 @@ # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ CURRENT_VERSION=`./mg-version.sh --version` +OLD_VERSION=`./mg-version.sh --oldversion_binary` +echo '===== Updating Linux Installer ======' +# local GAME_VERSION = "x.x.x"; echo 'Linux Installer version # before:' grep -E '^local GAME_VERSION = "[^"]*";$' mojosetup/megaglest-installer/scripts/config.lua;sed -i 's/^local GAME_VERSION = "[^"]*";$/local GAME_VERSION = "'$CURRENT_VERSION'";/' mojosetup/megaglest-installer/scripts/config.lua echo 'Linux Installer version # after:' grep -E '^local GAME_VERSION = "[^"]*";$' mojosetup/megaglest-installer/scripts/config.lua + +echo '===== Updating Windows Installer ======' +# !define APVER 3.6.0 +echo 'Windows Installer version # before:' +grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi;sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestInstaller.nsi +echo 'Windows Installer version # after:' +grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi + +echo 'Windows Installer version # before:' +grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi;sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/Installer/MegaGlestInstaller.nsi +echo 'Windows Installer version # after:' +grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi + +echo '===== Updating Windows Updater ======' +echo 'Windows Updater version # before:' +grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi;sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi +echo 'Windows Updater version # after:' +grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + +echo 'Windows Updater version # before:' +grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi;sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi +echo 'Windows Updater version # after:' +grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + +grep -E '^\!define APVER_UPDATE [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi;sed -i 's/^\!define APVER_UPDATE [^"]*$/\!define APVER_UPDATE '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi +echo 'Windows Updater version # after:' +grep -E '^\!define APVER_UPDATE [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + + diff --git a/mk/linux/mg-version.sh b/mk/linux/mg-version.sh index f111c36ee..40b578295 100755 --- a/mk/linux/mg-version.sh +++ b/mk/linux/mg-version.sh @@ -5,11 +5,14 @@ # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ OLD_MG_VERSION=3.6.0.1 +OLD_MG_VERSION_BINARY=3.6.0 #MG_VERSION=3.6.1-dev MG_VERSION=3.6.0.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 diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua index 4faed2536..56a53f5f2 100644 --- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua +++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua @@ -1,5 +1,5 @@ local GAME_INSTALL_SIZE = 680000000; -local GAME_VERSION = "3.6.0"; +local GAME_VERSION = "3.6.0.2"; local _ = MojoSetup.translate diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi index 5239d6a3c..a5c7412f0 100644 --- a/mk/windoze/Installer/MegaGlestInstaller.nsi +++ b/mk/windoze/Installer/MegaGlestInstaller.nsi @@ -3,8 +3,8 @@ !define APNAME MegaGlest !define APNAME_OLD Mega-Glest -!define APVER_OLD 3.5.2 -!define APVER 3.6.0 +!define APVER_OLD 3.6.0 +!define APVER 3.6.0.2 Name "${APNAME} ${APVER}" SetCompressor /FINAL /SOLID lzma diff --git a/mk/windoze/Installer/MegaGlestUpdater.nsi b/mk/windoze/Installer/MegaGlestUpdater.nsi index 91acdb28c..88671b17d 100644 --- a/mk/windoze/Installer/MegaGlestUpdater.nsi +++ b/mk/windoze/Installer/MegaGlestUpdater.nsi @@ -2,10 +2,10 @@ ; General Attributes !define APNAME MegaGlest -!define APVER 3.6.0 +!define APVER 3.6.0.2 !define APNAME_OLD Mega-Glest -!define APVER_OLD 3.5.2 -!define APVER_UPDATE 3.6.0 +!define APVER_OLD 3.6.0 +!define APVER_UPDATE 3.6.0.2 Name "${APNAME} ${APVER_UPDATE}" SetCompressor /FINAL /SOLID lzma diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index a3dc7c74d..3119793ec 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -27,7 +27,7 @@ using namespace Shared::Platform; namespace Glest { namespace Game { const char *mailString = " http://bugs.megaglest.org"; -const string glestVersionString = "v3.6.1-dev"; +const string glestVersionString = "v3.6.0.2"; #if defined(SVNVERSION) const string SVN_Rev = string("Rev: ") + string(SVNVERSION); #elif defined(SVNVERSIONHEADER)