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

(svn r11470) -Codechange: add git detection to MSVC (michi_cc)

release/0.6
glx 2007-11-18 22:39:02 +00:00
parent 400ca1dae5
commit 6097c07e4b
1 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
projects/determineversion.vbs
View File

@ -41,6 +41,12 @@ Sub UpdateFiles(version)
revision = Mid(OExec.StdOut.ReadLine(), 7) revision = Mid(OExec.StdOut.ReadLine(), 7)
revision = Mid(revision, 1, InStr(revision, ")") - 1) revision = Mid(revision, 1, InStr(revision, ")") - 1)
End If End If
Case "g" ' git
Set oExec = WshShell.Exec("git log --pretty=format:%s --grep=" & Chr(34) & "^(svn r[0-9]*)" & Chr(34) & " -1 ../src")
if Err.Number = 0 Then
revision = Mid(oExec.StdOut.ReadLine(), 7)
revision = Mid(revision, 1, InStr(revision, ")") - 1)
End If
End Select End Select
UpdateFile revision, version, cur_date, "../src/rev.cpp" UpdateFile revision, version, cur_date, "../src/rev.cpp"
@ -118,25 +124,52 @@ Function DetermineSVNVersion()
version = version & Replace(url, "/", "-") version = version & Replace(url, "/", "-")
End If End If
Else Else
' svn detection failed, reset error and try mercurial (hg) ' svn detection failed, reset error and try git
Err.Clear Err.Clear
Set oExec = WshShell.Exec("hg tip") Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
If Err.Number = 0 Then Do While oExec.Status = 0 And Err.Number = 0
version = "h" & Mid(OExec.StdOut.ReadLine(), 19, 8) ' Wait till command has finished
Set oExec = WshShell.Exec("hg status ../src") Loop
If Err.Number = 0 Then If Err.Number = 0 And oExec.ExitCode = 0 Then
Do version = "g" & oExec.StdOut.ReadLine()
line = OExec.StdOut.ReadLine() Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
If Mid(line, 1, 1) <> "?" Then Do While oExec.Status = 0 And Err.Number = 0
version = version & "M" Loop
Exit Do If Err.Number = 0 And oExec.ExitCode = 1 Then
End If version = version & "M"
Loop While Not OExec.StdOut.atEndOfStream
End If End If
Set oExec = WshShell.Exec("hg branch")
Set oExec = WshShell.Exec("git symbolic-ref HEAD")
If Err.Number = 0 Then If Err.Number = 0 Then
line = OExec.StdOut.ReadLine() line = oExec.StdOut.ReadLine()
If line <> "default" Then version = version & "-" & line line = Mid(line, InStrRev(line, "/")+1)
If line <> "master" Then
version = version & "-" & line
End If
End If
Else
' try mercurial (hg)
Err.Clear
Set oExec = WshShell.Exec("hg tip")
If Err.Number = 0 Then
version = "h" & Mid(OExec.StdOut.ReadLine(), 19, 8)
Set oExec = WshShell.Exec("hg status ../src")
If Err.Number = 0 Then
Do
line = OExec.StdOut.ReadLine()
If Mid(line, 1, 1) <> "?" Then
version = version & "M"
Exit Do
End If
Loop While Not OExec.StdOut.atEndOfStream
End If
Set oExec = WshShell.Exec("hg branch")
If Err.Number = 0 Then
line = OExec.StdOut.ReadLine()
If line <> "default" Then
version = version & "-" & line
End If
End If
End If End If
End If End If
End If End If