mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21356) -Fix (r21351): sometimes versions wouldn't be correctly set for Windows builds

release/1.1
rubidium 2010-11-30 12:02:19 +00:00
parent c45d88ea6c
commit 44937dfa5e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
projects/determineversion.vbs
View File

@ -86,7 +86,7 @@ Function ReadRegistryKey(shive, subkey, valuename, architecture)
End Function End Function
Function DetermineSVNVersion() Function DetermineSVNVersion()
Dim WshShell, version, branch, modified, revision, url, oExec, line, hash Dim WshShell, version, branch, modified, revision, clean_rev, url, oExec, line, hash
Set WshShell = CreateObject("WScript.Shell") Set WshShell = CreateObject("WScript.Shell")
On Error Resume Next On Error Resume Next
@ -261,10 +261,11 @@ Function DetermineSVNVersion()
End If ' version = "norev000" End If ' version = "norev000"
End If ' version <> "norev000" End If ' version <> "norev000"
If version = "norev000" And FSO.FileExists("../.ottdrev") Then
Dim rev_file Dim rev_file
Set rev_file = FSO.OpenTextFile("../.ottdrev", 1, True, 0) Set rev_file = FSO.OpenTextFile("../.ottdrev", 1, True, 0)
If Not rev_file.atEndOfStream Then
DetermineSVNVersion = rev_file.ReadLine() DetermineSVNVersion = rev_file.ReadLine()
rev_file.Close()
Else Else
If modified = 2 Then If modified = 2 Then
version = version & "M" version = version & "M"
@ -281,7 +282,6 @@ Function DetermineSVNVersion()
DetermineSVNVersion = version DetermineSVNVersion = version
End If End If
End If End If
rev_file.close
End Function End Function
Function IsCachedVersion(ByVal version) Function IsCachedVersion(ByVal version)