version.diff

Hirundo, 2009-12-31 13:25

Download (3.46 KB)

View differences:

config.lib Sat Dec 26 20:25:04 2009 +0100
11 11
}
12 12

  
13 13
set_default() {
14
	released_version=""
14
	released_version="IS_REV_NAME"
15 15

  
16 16
	ignore_extra_parameters="0"
17 17
	# We set all kinds of defaults for params. Later on the user can override
findversion.sh Sat Dec 26 20:25:04 2009 +0100
121 121
	REV="${REV}-$BRANCH"
122 122
fi
123 123

  
124
echo "$REV	$REV_NR	$MODIFIED	$CLEAN_REV"
124
echo "IS_REV_NAME	$REV_NR	$MODIFIED	IS_REV_NAME"
projects/determineversion.vbs Sat Dec 26 20:25:04 2009 +0100
39 39
		modified = Mid(version, InStrRev(version, Chr(9)) + 1)
40 40
		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
41 41
	Else
42
		version = "IS_REV_NAME"
42 43
		revision = 0
43 44
		modified = 1
44 45
	End If
src/os/windows/ottdres.rc.in Sat Dec 26 20:25:04 2009 +0100
79 79
//
80 80

  
81 81
VS_VERSION_INFO VERSIONINFO
82
 FILEVERSION 1,0,0,!!REVISION!!
83
 PRODUCTVERSION 1,0,0,!!REVISION!!
82
 FILEVERSION 1,0,0,IS_TRUNK_REV
83
 PRODUCTVERSION 1,0,0,IS_TRUNK_REV
84 84
 FILEFLAGSMASK 0x3fL
85 85
#ifdef _DEBUG
86 86
 FILEFLAGS 0x1L
......
98 98
            VALUE "Comments", "This program is licensed under the GNU General Public License version 2.\0"
99 99
            VALUE "CompanyName", "OpenTTD Development Team\0"
100 100
            VALUE "FileDescription", "OpenTTD\0"
101
            VALUE "FileVersion", "Development !!VERSION!!\0"
101
            VALUE "FileVersion", "IS_REV_NAME\0"
102 102
            VALUE "InternalName", "openttd\0"
103 103
            VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-2009. All Rights Reserved.\0"
104 104
            VALUE "LegalTrademarks", "\0"
105 105
            VALUE "OriginalFilename", "openttd.exe\0"
106 106
            VALUE "PrivateBuild", "\0"
107 107
            VALUE "ProductName", "OpenTTD\0"
108
            VALUE "ProductVersion", "Development !!VERSION!!\0"
108
            VALUE "ProductVersion", "IS_REV_NAME\0"
109 109
            VALUE "SpecialBuild", "-\0"
110 110
        END
111 111
    END
src/rev.cpp.in Sat Dec 26 20:25:04 2009 +0100
27 27
 * norev000 is for non-releases that are made on systems without
28 28
 * subversion or sources that are not a checkout of subversion.
29 29
 */
30
const char _openttd_revision[] = "!!VERSION!!";
30
const char _openttd_revision[] = "IS_REV_NAME";
31 31

  
32 32
/**
33 33
 * The text version of OpenTTD's build date.
......
60 60
 * final release will always have a lower version number than the released
61 61
 * version, thus making comparisions on specific revisions easy.
62 62
 */
63
const uint32 _openttd_newgrf_version = 1 << 28 | 0 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
63
const uint32 _openttd_newgrf_version = 1 << 28 | 0 << 24 | 0 << 20 | 0 << 19 | (IS_TRUNK_REV & ((1 << 19) - 1));
64 64

  
65 65
#ifdef __MORPHOS__
66 66
/**
67 67
 * Variable used by MorphOS to show the version.
68 68
 */
69
extern const char morphos_versions_tag[] = "$VER: OpenTTD !!VERSION!! (!!DATE!!) OpenTTD Team [MorphOS, PowerPC]";
69
extern const char morphos_versions_tag[] = "$VER: OpenTTD IS_REV_NAME (!!DATE!!) OpenTTD Team [MorphOS, PowerPC]";
70 70
#endif