From 11c394b22868995497ea42418cf413e387de287b Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 16 Feb 2009 21:59:33 +0000 Subject: [PATCH] (svn r15502) -Release 0.7.0-beta1. Many new features, small and big. Happy testing! --- config.lib | 2 +- projects/determineversion.vbs | 2 +- src/ottdres.rc.in | 8 ++++---- src/rev.cpp.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config.lib b/config.lib index 547c47c3a0..b5a4d02508 100644 --- a/config.lib +++ b/config.lib @@ -5,7 +5,7 @@ log() { } set_default() { - released_version="" + released_version="0.7.0-beta1" ignore_extra_parameters="0" # We set all kinds of defaults for params. Later on the user can override diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs index bcc68456c2..abc98d4293 100755 --- a/projects/determineversion.vbs +++ b/projects/determineversion.vbs @@ -278,7 +278,7 @@ Function CheckFile(filename) End Function Dim version -version = DetermineSVNVersion +version = "0.7.0-beta1" If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/ottdres.rc")) Then UpdateFiles version End If diff --git a/src/ottdres.rc.in b/src/ottdres.rc.in index 8ae187d513..13189ef8be 100644 --- a/src/ottdres.rc.in +++ b/src/ottdres.rc.in @@ -64,8 +64,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,0,@@REVISION@@ - PRODUCTVERSION 0,7,0,@@REVISION@@ + FILEVERSION 0,7,0,15502 + PRODUCTVERSION 0,7,0,15502 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -83,14 +83,14 @@ BEGIN VALUE "Comments", "This program is licensed under the GNU General Public License.\0" VALUE "CompanyName", "OpenTTD Development Team\0" VALUE "FileDescription", "OpenTTD\0" - VALUE "FileVersion", "Development @@VERSION@@\0" + VALUE "FileVersion", @@VERSION@@\0" VALUE "InternalName", "openttd\0" VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2009. All Rights Reserved.\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "openttd.exe\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "OpenTTD\0" - VALUE "ProductVersion", "Development @@VERSION@@\0" + VALUE "ProductVersion", "@@VERSION@@\0" VALUE "SpecialBuild", "-\0" END END diff --git a/src/rev.cpp.in b/src/rev.cpp.in index bae5c6085b..751c267c75 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -45,7 +45,7 @@ const byte _openttd_revision_modified = @@MODIFIED@@; * final release will always have a lower version number than the released * version, thus making comparisions on specific revisions easy. */ -const uint32 _openttd_newgrf_version = 0 << 28 | 7 << 24 | 0 << 20 | 0 << 19 | (@@REVISION@@ & ((1 << 19) - 1)); +const uint32 _openttd_newgrf_version = 0 << 28 | 7 << 24 | 0 << 20 | 0 << 19 | (15502 & ((1 << 19) - 1)); #ifdef __MORPHOS__ /**