diff --git a/src/resource/msw/mse.rc b/src/resource/msw/mse.rc index ce83d1af..9b499c01 100644 --- a/src/resource/msw/mse.rc +++ b/src/resource/msw/mse.rc @@ -204,15 +204,15 @@ expected_locale_keys TEXT "../common/expected_locale_keys" // -------------------------------------------------------- : Version info 1 VERSIONINFO -FILEVERSION 0,3,9,0 -PRODUCTVERSION 0,3,9,0 +FILEVERSION 2,0,0,0 +PRODUCTVERSION 2,0,0,0 FILETYPE VFT_APP { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "FileVersion", "0.3.9" + VALUE "FileVersion", "2.0.0" VALUE "License", "GNU General Public License 2 or later; This is free software, and you are welcome to redistribute it under certain conditions; See the help file for details" VALUE "FileDescription", "Magic Set Editor" VALUE "InternalName", "magicseteditor" diff --git a/src/util/version.cpp b/src/util/version.cpp index 7f5b61aa..3b5eb15a 100644 --- a/src/util/version.cpp +++ b/src/util/version.cpp @@ -50,11 +50,11 @@ template <> void GetDefaultMember::handle(const Version& v) { // ----------------------------------------------------------------------------- : Versions // NOTE: Don't use leading zeroes, they mean octal -const Version app_version = 309; // 0.3.9 +const Version app_version = 20000; // 2.0.0 #ifdef UNICODE -const Char* version_suffix = _(" (beta)"); +const Char* version_suffix = _(""); #else -const Char* version_suffix = _(" (beta, ascii build)"); +const Char* version_suffix = _(" (ascii build)"); #endif /// Which version of MSE are the files we write out compatible with? @@ -80,14 +80,15 @@ const Char* version_suffix = _(" (beta, ascii build)"); * - more scriptable fields. * - store time created,modified for cards -> changes set and clipboard format * 0.3.9 : bugfix release mostly, a few new script functions + * 2.0.0 : bugfix release mostly, added error console */ -const Version file_version_locale = 309; // 0.3.9 -const Version file_version_set = 308; // 0.3.8 -const Version file_version_game = 308; // 0.3.8 -const Version file_version_stylesheet = 308; // 0.3.8 -const Version file_version_symbol_font = 306; // 0.3.6 -const Version file_version_export_template = 307; // 0.3.7 -const Version file_version_installer = 307; // 0.3.7 -const Version file_version_symbol = 305; // 0.3.5 -const Version file_version_clipboard = 308; // 0.3.8 -const Version file_version_script = 307; // 0.3.7 +const Version file_version_locale = 20000; // 2.0.0 +const Version file_version_set = 308; // 0.3.8 +const Version file_version_game = 308; // 0.3.8 +const Version file_version_stylesheet = 308; // 0.3.8 +const Version file_version_symbol_font = 306; // 0.3.6 +const Version file_version_export_template = 307; // 0.3.7 +const Version file_version_installer = 307; // 0.3.7 +const Version file_version_symbol = 305; // 0.3.5 +const Version file_version_clipboard = 308; // 0.3.8 +const Version file_version_script = 307; // 0.3.7 diff --git a/tools/msw-installer/installer.iss b/tools/msw-installer/installer.iss index a253911f..c69b7189 100644 --- a/tools/msw-installer/installer.iss +++ b/tools/msw-installer/installer.iss @@ -1,6 +1,6 @@ ;//+----------------------------------------------------------------------------+ ;//| Description: Magic Set Editor - Program to make Magic (tm) cards | -;//| Copyright: (C) 2001 - 2008 Twan van Laarhoven and "coppro" | +;//| Copyright: (C) 2001 - 2011 Twan van Laarhoven and "coppro" | ;//| License: GNU General Public License 2 or later (see file COPYING) | ;//+----------------------------------------------------------------------------+ @@ -14,7 +14,7 @@ [setup] AppName = Magic Set Editor 2 -AppVerName = Magic Set Editor 2 - 0.3.9 beta +AppVerName = Magic Set Editor 2.0.0 AppCopyright = Copyright © 2001-2011 Twan van Laarhoven and "coppro" DefaultDirName = {pf}\Magic Set Editor 2 DisableStartupPrompt = 1 @@ -24,7 +24,6 @@ ChangesAssociations = 1 WizardImageBackColor = $FFF7F0 BackColor = $FFF7F0 BackColor2 = $FFF7F0 -InfoBeforeFile = tools/msw-installer/beta-readme.rtf ;LicenseFile = COPYING OutputDir = tools/msw-installer/ WizardImageFile = tools/msw-installer/WizModernImage.bmp @@ -35,7 +34,7 @@ PrivilegesRequired = none ; Filename of the installer #define INSTALLER_DATE GetDateTimeString('yyyy-mm-dd','-',':') #if INSTALL_ALL - #define INSTALLER_SUFFIX '' + #define INSTALLER_SUFFIX '-full' #else #define INSTALLER_SUFFIX '-reduced' #endif