gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg

Browse Source
This commit is contained in:
glx 2008-08-02 19:48:54 +00:00
parent 770d293788
commit ea570c8160
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
projects/determineversion.vbs
View File

@ -9,7 +9,7 @@ Sub FindReplaceInFile(filename, to_find, replacement)
data = file.ReadAll data = file.ReadAll
file.Close file.Close
data = Replace(data, to_find, replacement) data = Replace(data, to_find, replacement)
Set file = FSO.CreateTextFile(FileName, -1, 0) Set file = FSO.CreateTextFile(filename, -1, 0)
file.Write data file.Write data
file.Close file.Close
End Sub End Sub
@ -141,6 +141,11 @@ Function DetermineSVNVersion()
' Do we have subversion installed? Check immediatelly whether we've got a modified WC. ' Do we have subversion installed? Check immediatelly whether we've got a modified WC.
Set oExec = WshShell.Exec("svnversion ../src") Set oExec = WshShell.Exec("svnversion ../src")
If Err.Number = 0 Then If Err.Number = 0 Then
' Wait till the application is finished ...
Do While oExec.Status = 0
Loop
End If
If Err.Number = 0 And oExec.ExitCode = 0 Then
Dim modified Dim modified
If InStr(OExec.StdOut.ReadLine(), "M") Then If InStr(OExec.StdOut.ReadLine(), "M") Then
modified = "M" modified = "M"
@ -178,6 +183,11 @@ Function DetermineSVNVersion()
Err.Clear Err.Clear
Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD") Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
If Err.Number = 0 Then If Err.Number = 0 Then
' Wait till the application is finished ...
Do While oExec.Status = 0
Loop
End If
If Err.Number = 0 And oExec.ExitCode = 0 Then
version = "g" & oExec.StdOut.ReadLine() version = "g" & oExec.StdOut.ReadLine()
Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src") Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
Do While oExec.Status = 0 And Err.Number = 0 Do While oExec.Status = 0 And Err.Number = 0
@ -199,6 +209,11 @@ Function DetermineSVNVersion()
Err.Clear Err.Clear
Set oExec = WshShell.Exec("hg tip") Set oExec = WshShell.Exec("hg tip")
If Err.Number = 0 Then If Err.Number = 0 Then
' Wait till the application is finished ...
Do While oExec.Status = 0
Loop
End If
If Err.Number = 0 And oExec.ExitCode = 0 Then
version = "h" & Mid(OExec.StdOut.ReadLine(), 19, 8) version = "h" & Mid(OExec.StdOut.ReadLine(), 19, 8)
Set oExec = WshShell.Exec("hg status ../src") Set oExec = WshShell.Exec("hg status ../src")
If Err.Number = 0 Then If Err.Number = 0 Then