From 3dba2cfdd24d8f234f00e07fac305b903714fb5b Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 23 Dec 2009 23:15:04 +0000 Subject: [PATCH] (svn r18623) -Release: 1.0.0-beta1; Merry Christmas! Many thans to everyone who has made this possible. --- config.lib | 2 +- os/windows/installer/install.nsi | 2 +- projects/determineversion.vbs | 1 + src/os/windows/ottdres.rc.in | 8 ++++---- src/rev.cpp.in | 6 +++--- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/config.lib b/config.lib index 785427edfa..c0ba0f1982 100644 --- a/config.lib +++ b/config.lib @@ -11,7 +11,7 @@ log() { } set_default() { - released_version="" + released_version="1.0.0-beta1" ignore_extra_parameters="0" # We set all kinds of defaults for params. Later on the user can override diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 3e7210a6a4..abc0dcae4a 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -3,7 +3,7 @@ !define APPV_MINOR 0 !define APPV_MAINT 0 !define APPV_BUILD 0 -!define APPV_EXTRA "" +!define APPV_EXTRA "-beta1" !define APPNAME "OpenTTD" ; Define application name !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs index 1c6f48552d..bd12337ab5 100755 --- a/projects/determineversion.vbs +++ b/projects/determineversion.vbs @@ -39,6 +39,7 @@ Sub UpdateFiles(version) modified = Mid(version, InStrRev(version, Chr(9)) + 1) version = Mid(version, 1, InStr(version, Chr(9)) - 1) Else + version = "1.0.0-beta1" revision = 0 modified = 1 End If diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in index 48c2e97a90..d7201f699d 100644 --- a/src/os/windows/ottdres.rc.in +++ b/src/os/windows/ottdres.rc.in @@ -79,8 +79,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,!!REVISION!! - PRODUCTVERSION 1,0,0,!!REVISION!! + FILEVERSION 1,0,0,18623 + PRODUCTVERSION 1,0,0,18623 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -98,14 +98,14 @@ BEGIN VALUE "Comments", "This program is licensed under the GNU General Public License version 2.\0" VALUE "CompanyName", "OpenTTD Development Team\0" VALUE "FileDescription", "OpenTTD\0" - VALUE "FileVersion", "Development !!VERSION!!\0" + VALUE "FileVersion", "1.0.0-beta1\0" VALUE "InternalName", "openttd\0" VALUE "LegalCopyright", "Copyright \xA9 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", "1.0.0-beta1\0" VALUE "SpecialBuild", "-\0" END END diff --git a/src/rev.cpp.in b/src/rev.cpp.in index 6e33a64f31..689168c0f0 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -27,7 +27,7 @@ * norev000 is for non-releases that are made on systems without * subversion or sources that are not a checkout of subversion. */ -const char _openttd_revision[] = "!!VERSION!!"; +const char _openttd_revision[] = "1.0.0-beta1"; /** * The text version of OpenTTD's build date. @@ -60,11 +60,11 @@ 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 = 1 << 28 | 0 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); +const uint32 _openttd_newgrf_version = 1 << 28 | 0 << 24 | 0 << 20 | 0 << 19 | (18623 & ((1 << 19) - 1)); #ifdef __MORPHOS__ /** * Variable used by MorphOS to show the version. */ -extern const char morphos_versions_tag[] = "$VER: OpenTTD !!VERSION!! (!!DATE!!) OpenTTD Team [MorphOS, PowerPC]"; +extern const char morphos_versions_tag[] = "$VER: OpenTTD 1.0.0-beta1 (!!DATE!!) OpenTTD Team [MorphOS, PowerPC]"; #endif