From 70aba0168623f1956d3cb7a307f476579f4658db Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 18 Nov 2007 15:14:53 +0000 Subject: [PATCH] (svn r11462) -Release: 0.6.0-beta1. The first major step into the road of releasing 0.6.0, which will give you loads of new features, like newhouses, newindustries, signals and diagonal tracks under bridges, trams, autoslope, oneway roads, half tile slopes and much more. It furthermore contains quite a few performance improvements under certain conditions as well as a very long list of bugreports. If you are really interested, you should read the changelog. We OpenTTD developers hope that you will thoroughly test it so we can quickly release the real 0.6.0. Have fun! --- 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 bfe9338397..4fb45339c5 100644 --- a/config.lib +++ b/config.lib @@ -5,7 +5,7 @@ log() { } set_default() { - released_version="" + released_version="0.6.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 4576e3b238..f74bfc3776 100644 --- a/projects/determineversion.vbs +++ b/projects/determineversion.vbs @@ -164,7 +164,7 @@ Function IsCachedVersion(version) End Function Dim version -version = DetermineSVNVersion +version = "0.6.0-beta1" If Not (IsCachedVersion(version) And FSO.FileExists("../src/rev.cpp") And FSO.FileExists("../src/ottdres.rc")) Then UpdateFiles version End If diff --git a/src/ottdres.rc.in b/src/ottdres.rc.in index 72e1d813e8..793ff2d8b4 100644 --- a/src/ottdres.rc.in +++ b/src/ottdres.rc.in @@ -66,8 +66,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,6,0,@@REVISION@@ - PRODUCTVERSION 0,6,0,@@REVISION@@ + FILEVERSION 0,6,0,11462 + PRODUCTVERSION 0,6,0,11462 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -85,14 +85,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-2007. 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 0db42ac602..c58d29f182 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -34,7 +34,7 @@ extern const char _openttd_revision[] = "@@VERSION@@"; * final release will always have a lower version number than the released * version, thus making comparisions on specific revisions easy. */ -uint32 _openttd_newgrf_version = 0 << 28 | 6 << 24 | 0 << 20 | 0 << 19 | (@@REVISION@@ & ((1 << 19) - 1)); +uint32 _openttd_newgrf_version = 0 << 28 | 6 << 24 | 0 << 20 | 0 << 19 | (11462 & ((1 << 19) - 1)); #ifdef __MORPHOS__ /**