From 90c307182e6d8f695b2d06057683e4a8b4a1b6a1 Mon Sep 17 00:00:00 2001 From: filux Date: Mon, 9 Mar 2015 00:34:59 +0100 Subject: [PATCH] updated version number for release --- data/glest_game | 2 +- mk/linux/mg-version-synch.sh | 2 ++ mk/linux/mojosetup/megaglest-installer/scripts/config.lua | 2 +- mk/windoze/Installer/MegaGlestInstaller.nsi | 2 +- mk/windoze/Installer/MegaGlestUpdater.nsi | 4 ++-- source/g3d_viewer/main.cpp | 2 +- source/glest_game/facilities/game_util.cpp | 4 ++-- source/glest_map_editor/main.cpp | 2 +- source/version.txt | 4 ++-- 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/data/glest_game b/data/glest_game index 3e057fc4..e92df160 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 3e057fc45e7b4e633d4a73980c4cca3bd7e54237 +Subproject commit e92df160ae6b5495d2590be1e8b4a9efaf91b995 diff --git a/mk/linux/mg-version-synch.sh b/mk/linux/mg-version-synch.sh index 604d728a..43d352b1 100755 --- a/mk/linux/mg-version-synch.sh +++ b/mk/linux/mg-version-synch.sh @@ -5,6 +5,8 @@ # 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" diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua index 04319fac..218933b4 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.12-dev"; +local GAME_VERSION = "3.11.1"; local _ = MojoSetup.translate diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi index ff280e01..20a8a514 100644 --- a/mk/windoze/Installer/MegaGlestInstaller.nsi +++ b/mk/windoze/Installer/MegaGlestInstaller.nsi @@ -4,7 +4,7 @@ !define APNAME MegaGlest !define APNAME_OLD Mega-Glest !define APVER_OLD 3.11.0 -!define APVER 3.12-dev +!define APVER 3.11.1 Name "${APNAME} ${APVER}" SetCompressor /FINAL /SOLID lzma diff --git a/mk/windoze/Installer/MegaGlestUpdater.nsi b/mk/windoze/Installer/MegaGlestUpdater.nsi index b1efc649..7f10a2de 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.12-dev +!define APVER 3.11.1 !define APNAME_OLD Mega-Glest !define APVER_OLD 3.11.0 -!define APVER_UPDATE 3.12-dev +!define APVER_UPDATE 3.11.1 Name "${APNAME} ${APVER_UPDATE}" SetCompressor /FINAL /SOLID lzma diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index 624fca2c..f655a930 100644 --- a/source/g3d_viewer/main.cpp +++ b/source/g3d_viewer/main.cpp @@ -58,7 +58,7 @@ const char *folderDelimiter = "/"; //int GameConstants::updateFps= 40; //int GameConstants::cameraFps= 100; -const string g3dviewerVersionString= "v3.12-dev"; +const string g3dviewerVersionString= "v3.11.1"; // Because g3d should always support alpha transparency string fileFormat = "png"; diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index 02440651..e83b0a7b 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -32,7 +32,7 @@ const char *mailString = " http://bugs.megaglest.org"; // !! Use minor versions !! Only major and minor version control compatibility! // typical version numbers look like this: v3.11-beta1.0 v3.12-dev v3.12.0 // don't forget to update mk/linux/mg-version.sh -const string glestVersionString = "v3.12-dev"; +const string glestVersionString = "v3.11.1"; const string lastCompatibleSaveGameVersionString = "v3.9.0"; #if defined(GITVERSION) @@ -43,7 +43,7 @@ const string lastCompatibleSaveGameVersionString = "v3.9.0"; const string GIT_RawRev = string(GITVERSION); const string GIT_Rev = string("Rev: ") + string(GITVERSION); #else -const string GIT_RawRev = "$5060.7451e49$"; +const string GIT_RawRev = "$5088.9d98d2e$"; const string GIT_Rev = "$Rev$"; #endif diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index d4ae98b6..ec014ae2 100644 --- a/source/glest_map_editor/main.cpp +++ b/source/glest_map_editor/main.cpp @@ -46,7 +46,7 @@ string getGameReadWritePath(string lookupKey) { namespace MapEditor { -const string mapeditorVersionString = "v3.12-dev"; +const string mapeditorVersionString = "v3.11.1"; const string MainWindow::winHeader = "MegaGlest Map Editor " + mapeditorVersionString; // =============================================== diff --git a/source/version.txt b/source/version.txt index 71ba4036..26b456f9 100644 --- a/source/version.txt +++ b/source/version.txt @@ -3,11 +3,11 @@ # Versions will be updated everywhere automatically. # Then you should commit changed files and that's all. -CurrentGameVersion = "3.12-dev"; +CurrentGameVersion = "3.11.1"; # ^ typical version numbers look like this: "3.11-beta1.0", "3.12-dev", "3.12.0" OldReleaseGameVersion = "3.11.0"; LastCompatibleSaveGameVersion = "3.9.0"; -GitCommitForRelease = "5060.7451e49"; +GitCommitForRelease = "5088.9d98d2e"; # ^ will be automatically generated