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

(svn r11531) -Fix [FS#1459]: version determination did stall (read: never finish) when both svn and git were not installed.

release/0.6
rubidium 2007-11-26 23:28:29 +00:00
parent 6f7d37d3d3
commit 8c5814156f
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
projects/determineversion.vbs
View File

@ -127,10 +127,7 @@ Function DetermineSVNVersion()
' svn detection failed, reset error and try git ' svn detection failed, reset error and try git
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")
Do While oExec.Status = 0 And Err.Number = 0 If Err.Number = 0 Then
' Wait till command has finished
Loop
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