cpp/openttd-patchpack/source Changeset - r7917:a6fa3e1c2370

Changeset - r7917:a6fa3e1c2370

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx - 17 years ago 2007-11-18 22:39:02
glx@openttd.org

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

1 file changed with 48 insertions and 15 deletions:

projects/determineversion.vbs

0 comments (0 inline, 0 general)

projects/determineversion.vbs

➞

Show inline comments

@@ @@ -38,12 +38,18 @@ Sub UpdateFiles(version) @@
 		Case "h" ' mercurial (hg)
 			Set oExec = WshShell.Exec("hg log -k " & Chr(34) & "svn" & Chr(34) & " -l 1 --template " & Chr(34) & "{desc}\n" & Chr(34) & " ../src")
 			If Err.Number = 0 Then
 				revision = Mid(OExec.StdOut.ReadLine(), 7)
 				revision = Mid(revision, 1, InStr(revision, ")") - 1)
 			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
 	UpdateFile revision, version, cur_date, "../src/rev.cpp"
 	UpdateFile revision, version, cur_date, "../src/ottdres.rc"
 End Sub
@@ @@ -115,31 +121,58 @@ Function DetermineSVNVersion() @@
 		If InStr(url, "branches") Then
 			url = Mid(url, InStr(url, "branches") + 8)
 			url = Mid(url, 1, InStr(2, url, "/") - 1)
 			version = version & Replace(url, "/", "-")
 		End If
 	Else
-		' svn detection failed, reset error and try mercurial (hg)
+		' svn detection failed, reset error and try git
 		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")
 		Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
 		Do While oExec.Status = 0 And Err.Number = 0
 			' Wait till command has finished
 		Loop
 		If Err.Number = 0 And oExec.ExitCode = 0 Then
 			version = "g" & oExec.StdOut.ReadLine()
 			Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
 			Do While oExec.Status = 0 And Err.Number = 0
 			Loop
 			If Err.Number = 0 And oExec.ExitCode = 1 Then
 				version = version & "M"
 			End If
 			Set oExec = WshShell.Exec("git symbolic-ref HEAD")
 			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
 				line = oExec.StdOut.ReadLine()
 				line = Mid(line, InStrRev(line, "/")+1)
 				If line <> "master" Then
 					version = version & "-" & line
 				End If
 			End If
 			Set oExec = WshShell.Exec("hg branch")
 		Else
 			' try mercurial (hg)
 			Err.Clear
 			Set oExec = WshShell.Exec("hg tip")
 			If Err.Number = 0 Then
 					line = OExec.StdOut.ReadLine()
 					If line <> "default" Then version = version & "-" & line
 				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
 	DetermineSVNVersion = version
 End Function

0 comments (0 inline, 0 general)