Files
@ r10164:44f57076dea8
Branch filter:
Location: cpp/openttd-patchpack/source/projects/determineversion.vbs - annotation
r10164:44f57076dea8
8.7 KiB
text/plain
(svn r14355) -Fix: latest svn revision detection from hg log always gave the latest relative to tip revision, not to the current working revision
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r9783:ca11f82b927a r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r9457:ecfeb802c57a r7564:3b7ac73c8322 r9457:ecfeb802c57a r7780:af8c230bc12c r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r9457:ecfeb802c57a r7784:539d18cd882a r7564:3b7ac73c8322 r7784:539d18cd882a r9457:ecfeb802c57a r7784:539d18cd882a r7784:539d18cd882a r7784:539d18cd882a r7784:539d18cd882a r7784:539d18cd882a r9457:ecfeb802c57a r9457:ecfeb802c57a r9457:ecfeb802c57a r7784:539d18cd882a r7784:539d18cd882a r7784:539d18cd882a r7784:539d18cd882a r7784:539d18cd882a r10164:44f57076dea8 r7784:539d18cd882a r7784:539d18cd882a r7784:539d18cd882a r7784:539d18cd882a r7917:a6fa3e1c2370 r7917:a6fa3e1c2370 r7917:a6fa3e1c2370 r7917:a6fa3e1c2370 r7917:a6fa3e1c2370 r7917:a6fa3e1c2370 r7784:539d18cd882a r7780:af8c230bc12c r9457:ecfeb802c57a r9457:ecfeb802c57a r7564:3b7ac73c8322 r7564:3b7ac73c8322 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r7564:3b7ac73c8322 r7784:539d18cd882a r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r7564:3b7ac73c8322 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r7564:3b7ac73c8322 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r7564:3b7ac73c8322 r8702:158df70aa3b4 r8702:158df70aa3b4 r8702:158df70aa3b4 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r9783:ca11f82b927a r9783:ca11f82b927a r9783:ca11f82b927a r7564:3b7ac73c8322 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r7564:3b7ac73c8322 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r10074:4f5c11b805a1 r7917:a6fa3e1c2370 r7784:539d18cd882a r7917:a6fa3e1c2370 r7975:f76f5c0274bd r9783:ca11f82b927a r9783:ca11f82b927a r9783:ca11f82b927a r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r7917:a6fa3e1c2370 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r7917:a6fa3e1c2370 r10163:69a6bbca3014 r7784:539d18cd882a r9783:ca11f82b927a r9783:ca11f82b927a r9783:ca11f82b927a r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r10074:4f5c11b805a1 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 r7564:3b7ac73c8322 | Option Explicit
Dim FSO
Set FSO = CreateObject("Scripting.FileSystemObject")
Sub FindReplaceInFile(filename, to_find, replacement)
Dim file, data
Set file = FSO.OpenTextFile(filename, 1, 0, 0)
data = file.ReadAll
file.Close
data = Replace(data, to_find, replacement)
Set file = FSO.CreateTextFile(filename, -1, 0)
file.Write data
file.Close
End Sub
Sub UpdateFile(modified, revision, version, cur_date, filename)
FSO.CopyFile filename & ".in", filename
FindReplaceInFile filename, "@@MODIFIED@@", modified
FindReplaceInFile filename, "@@REVISION@@", revision
FindReplaceInFile filename, "@@VERSION@@", version
FindReplaceInFile filename, "@@DATE@@", cur_date
End Sub
Sub UpdateFiles(version)
Dim WshShell, cur_date, modified, revision, oExec
Set WshShell = CreateObject("WScript.Shell")
cur_date = DatePart("D", Date) & "." & DatePart("M", Date) & "." & DatePart("YYYY", Date)
revision = 0
modified = 1
Select Case Mid(version, 1, 1)
Case "r" ' svn
revision = Mid(version, 2)
If InStr(revision, "M") Then
revision = Mid(revision, 1, InStr(revision, "M") - 1)
modified = 2
Else
modified = 0
End If
If InStr(revision, "-") Then
revision = Mid(revision, 1, InStr(revision, "-") - 1)
End If
Case "h" ' mercurial (hg)
Set oExec = WshShell.Exec("hg log -r " & Mid(version, 2, 8) & ":0 -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 modified, revision, version, cur_date, "../src/rev.cpp"
UpdateFile modified, revision, version, cur_date, "../src/ottdres.rc"
End Sub
Function ReadRegistryKey(shive, subkey, valuename, architecture)
Dim hiveKey, objCtx, objLocator, objServices, objReg, Inparams, Outparams
' First, get the Registry Provider for the requested architecture
Set objCtx = CreateObject("WbemScripting.SWbemNamedValueSet")
objCtx.Add "__ProviderArchitecture", architecture ' Must be 64 of 32
Set objLocator = CreateObject("Wbemscripting.SWbemLocator")
Set objServices = objLocator.ConnectServer("","root\default","","",,,,objCtx)
Set objReg = objServices.Get("StdRegProv")
' Check the hive and give it the right value
Select Case shive
Case "HKCR", "HKEY_CLASSES_ROOT"
hiveKey = &h80000000
Case "HKCU", "HKEY_CURRENT_USER"
hiveKey = &H80000001
Case "HKLM", "HKEY_LOCAL_MACHINE"
hiveKey = &h80000002
Case "HKU", "HKEY_USERS"
hiveKey = &h80000003
Case "HKCC", "HKEY_CURRENT_CONFIG"
hiveKey = &h80000005
Case "HKDD", "HKEY_DYN_DATA" ' Only valid for Windows 95/98
hiveKey = &h80000006
Case Else
MsgBox "Hive not valid (ReadRegistryKey)"
End Select
Set Inparams = objReg.Methods_("GetStringValue").Inparameters
Inparams.Hdefkey = hiveKey
Inparams.Ssubkeyname = subkey
Inparams.Svaluename = valuename
Set Outparams = objReg.ExecMethod_("GetStringValue", Inparams,,objCtx)
ReadRegistryKey = Outparams.SValue
End Function
Function DetermineSVNVersion()
Dim WshShell, version, url, oExec, line
Set WshShell = CreateObject("WScript.Shell")
On Error Resume Next
' Try TortoiseSVN
' Get the directory where TortoiseSVN (should) reside(s)
Dim sTortoise
' First, try with 32-bit architecture
sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 32)
If sTortoise = Nothing Then
' No 32-bit version of TortoiseSVN installed, try 64-bit version (doesn't hurt on 32-bit machines, it returns nothing or is ignored)
sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 64)
End If
' If TortoiseSVN is installed, try to get the revision number
If sTortoise <> Nothing Then
Dim file
' Write some "magic" to a temporary file so we can acquire the svn revision/state
Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0)
file.WriteLine "r$WCREV$$WCMODS?M:$"
file.WriteLine "$WCURL$"
file.Close
Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp")
' Wait till the application is finished ...
Do
OExec.StdOut.ReadLine()
Loop While Not OExec.StdOut.atEndOfStream
Set file = FSO.OpenTextFile("tsvn_tmp", 1, 0, 0)
version = file.ReadLine
url = file.ReadLine
file.Close
Set file = FSO.GetFile("tsvn_tmp")
file.Delete
End If
' Looks like there is no TortoiseSVN installed either. Then we don't know it.
If InStr(version, "$") Then
' Reset error and version
Err.Clear
version = "norev000"
' Set the environment to english
WshShell.Environment("PROCESS")("LANG") = "en"
' Do we have subversion installed? Check immediatelly whether we've got a modified WC.
Set oExec = WshShell.Exec("svnversion ../src")
If Err.Number = 0 Then
' Wait till the application is finished ...
Do While oExec.Status = 0
Loop
line = OExec.StdOut.ReadLine()
If line <> "exported" Then
Dim modified
If InStr(line, "M") Then
modified = "M"
Else
modified = ""
End If
' And use svn info to get the correct revision and branch information.
Set oExec = WshShell.Exec("svn info ../src")
If Err.Number = 0 Then
Do
line = OExec.StdOut.ReadLine()
If InStr(line, "URL") Then
url = line
End If
If InStr(line, "Last Changed Rev") Then
version = "r" & Mid(line, 19) & modified
End If
Loop While Not OExec.StdOut.atEndOfStream
End If ' Err.Number = 0
End If ' line <> "exported"
End If ' Err.Number = 0
End If ' InStr(version, "$")
If version <> "norev000" Then
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 ' version <> "norev000"
' svn detection failed, reset error and try git
Err.Clear
Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
If Err.Number = 0 Then
' Wait till the application is finished ...
Do While oExec.Status = 0
Loop
If oExec.ExitCode = 0 Then
version = "g" & oExec.StdOut.ReadLine()
Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
If Err.Number = 0 Then
' Wait till the application is finished ...
Do While oExec.Status = 0
Loop
If oExec.ExitCode = 1 Then
version = version & "M"
End If ' oExec.ExitCode = 1
Set oExec = WshShell.Exec("git symbolic-ref HEAD")
If Err.Number = 0 Then
line = oExec.StdOut.ReadLine()
line = Mid(line, InStrRev(line, "/") + 1)
If line <> "master" Then
version = version & "-" & line
End If ' line <> "master"
End If ' Err.Number = 0
End If ' Err.Number = 0
End If ' oExec.ExitCode = 0
End If ' Err.Number = 0
If version = "norev000" Then
' git detection failed, reset error and try mercurial (hg)
Err.Clear
Set oExec = WshShell.Exec("hg parents")
If Err.Number = 0 Then
' Wait till the application is finished ...
Do While oExec.Status = 0
Loop
If oExec.ExitCode = 0 Then
line = OExec.StdOut.ReadLine()
version = "h" & Mid(line, InStrRev(line, ":") + 1, 8)
Set oExec = WshShell.Exec("hg status ../src")
If Err.Number = 0 Then
Do
line = OExec.StdOut.ReadLine()
If Len(line) > 0 And Mid(line, 1, 1) <> "?" Then
version = version & "M"
Exit Do
End If ' Len(line) > 0 And Mid(line, 1, 1) <> "?"
Loop While Not OExec.StdOut.atEndOfStream
Set oExec = WshShell.Exec("hg branch")
If Err.Number = 0 Then
line = OExec.StdOut.ReadLine()
If line <> "default" Then
version = version & "-" & line
End If ' line <> "default"
End If ' Err.Number = 0
End If ' Err.Number = 0
End If ' oExec.ExitCode = 0
End If ' Err.Number = 0
End If ' version = "norev000"
End If ' version <> "norev000"
DetermineSVNVersion = version
End Function
Function IsCachedVersion(version)
Dim cache_file, cached_version
cached_version = ""
Set cache_file = FSO.OpenTextFile("../config.cache.version", 1, True, 0)
If Not cache_file.atEndOfStream Then
cached_version = cache_file.ReadLine()
End If
cache_file.Close
If version <> cached_version Then
Set cache_file = fso.CreateTextFile("../config.cache.version", True)
cache_file.WriteLine(version)
cache_file.Close
IsCachedVersion = False
Else
IsCachedVersion = True
End If
End Function
Dim version
version = DetermineSVNVersion
If Not (IsCachedVersion(version) And FSO.FileExists("../src/rev.cpp") And FSO.FileExists("../src/ottdres.rc")) Then
UpdateFiles version
End If
|