diff options
| author | michi_cc <michi_cc@openttd.org> | 2011-01-18 21:27:30 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2011-01-18 21:27:30 +0000 |
| commit | 73da045f50ac7aa67ad9330e4671f1d49c6c340c (patch) | |
| tree | 77c2f1c6eb638032869562e83f5ea43231e89cc3 /projects | |
| parent | 561449992a943fe796ac1d0cb4f4126c108a266c (diff) | |
| download | openttd-73da045f50ac7aa67ad9330e4671f1d49c6c340c.tar.xz | |
(svn r21839) -Change: Support tags created by git-svn for the revision detection.
Diffstat (limited to 'projects')
| -rwxr-xr-x | projects/determineversion.vbs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs index 7fd9f3610..872ff7b0a 100755 --- a/projects/determineversion.vbs +++ b/projects/determineversion.vbs @@ -201,7 +201,7 @@ Function DetermineSVNVersion() End If ' line <> "master" End If ' Err.Number = 0 - Set oExec = WshShell.Exec("git log --pretty=format:%s --grep=" & Chr(34) & "^(svn r[0-9]*)" & Chr(34) & " -1 ../") + Set oExec = WshShell.Exec("git log --pretty=format:%s --grep=" & Chr(34) & "^(svn r[0-9]*)" & Chr(34) & " -1") if Err.Number = 0 Then revision = Mid(oExec.StdOut.ReadLine(), 7) revision = Mid(revision, 1, InStr(revision, ")") - 1) @@ -210,13 +210,26 @@ Function DetermineSVNVersion() ' No revision? Maybe it is a custom git-svn clone ' Reset error number as WshShell.Exec will not do that on success Err.Clear - Set oExec = WshShell.Exec("git log --pretty=format:%b --grep=" & Chr(34) & "git-svn-id:.*@[0-9]*" & Chr(34) & " -1 ../") + Set oExec = WshShell.Exec("git log --pretty=format:%b --grep=" & Chr(34) & "git-svn-id:.*@[0-9]*" & Chr(34) & " -1") If Err.Number = 0 Then revision = oExec.StdOut.ReadLine() revision = Mid(revision, InStr(revision, "@") + 1) revision = Mid(revision, 1, InStr(revision, " ") - 1) End If ' Err.Number = 0 End If ' revision = "" + + ' Check if a tag is currently checked out + Err.Clear + Set oExec = WshShell.Exec("git name-rev --name-only --tags --no-undefined HEAD") + If Err.Number = 0 Then + ' Wait till the application is finished ... + Do While oExec.Status = 0 + Loop + If oExec.ExitCode = 0 Then + version = oExec.StdOut.ReadLine() + branch = "" + End If ' oExec.ExitCode = 0 + End If ' Err.Number = 0 End If ' Err.Number = 0 End If ' oExec.ExitCode = 0 End If ' Err.Number = 0 |