author | truebrain |
Fri, 18 Jul 2008 10:15:16 +0000 | |
branch | noai |
changeset 11168 | 3842648184cd |
parent 10829 | 8a0ec0f0f928 |
permissions | -rwxr-xr-x |
9703 | 1 |
Option Explicit |
2 |
||
3 |
Dim FSO |
|
4 |
Set FSO = CreateObject("Scripting.FileSystemObject") |
|
5 |
||
6 |
Sub FindReplaceInFile(filename, to_find, replacement) |
|
7 |
Dim file, data |
|
8 |
Set file = FSO.OpenTextFile(filename, 1, 0, 0) |
|
9 |
data = file.ReadAll |
|
10 |
file.Close |
|
11 |
data = Replace(data, to_find, replacement) |
|
12 |
Set file = FSO.CreateTextFile(FileName, -1, 0) |
|
13 |
file.Write data |
|
14 |
file.Close |
|
15 |
End Sub |
|
16 |
||
10829 | 17 |
Sub UpdateFile(modified, revision, version, cur_date, filename) |
9703 | 18 |
FSO.CopyFile filename & ".in", filename |
10829 | 19 |
FindReplaceInFile filename, "@@MODIFIED@@", modified |
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
20 |
FindReplaceInFile filename, "@@REVISION@@", revision |
9703 | 21 |
FindReplaceInFile filename, "@@VERSION@@", version |
22 |
FindReplaceInFile filename, "@@DATE@@", cur_date |
|
23 |
End Sub |
|
24 |
||
25 |
Sub UpdateFiles(version) |
|
10829 | 26 |
Dim WshShell, cur_date, modified, revision, oExec |
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
27 |
Set WshShell = CreateObject("WScript.Shell") |
9703 | 28 |
cur_date = DatePart("D", Date) & "." & DatePart("M", Date) & "." & DatePart("YYYY", Date) |
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
29 |
revision = 0 |
10829 | 30 |
modified = 1 |
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
31 |
Select Case Mid(version, 1, 1) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
32 |
Case "r" ' svn |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
33 |
revision = Mid(version, 2) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
34 |
If InStr(revision, "M") Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
35 |
revision = Mid(revision, 1, InStr(revision, "M") - 1) |
10829 | 36 |
modified = 2 |
37 |
Else |
|
38 |
modified = 0 |
|
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
39 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
40 |
If InStr(revision, "-") Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
41 |
revision = Mid(revision, 1, InStr(revision, "-") - 1) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
42 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
43 |
Case "h" ' mercurial (hg) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
44 |
Set oExec = WshShell.Exec("hg log -k " & Chr(34) & "svn" & Chr(34) & " -l 1 --template " & Chr(34) & "{desc}\n" & Chr(34) & " ../src") |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
45 |
If Err.Number = 0 Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
46 |
revision = Mid(OExec.StdOut.ReadLine(), 7) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
47 |
revision = Mid(revision, 1, InStr(revision, ")") - 1) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
48 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
49 |
Case "g" ' git |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
50 |
Set oExec = WshShell.Exec("git log --pretty=format:%s --grep=" & Chr(34) & "^(svn r[0-9]*)" & Chr(34) & " -1 ../src") |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
51 |
if Err.Number = 0 Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
52 |
revision = Mid(oExec.StdOut.ReadLine(), 7) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
53 |
revision = Mid(revision, 1, InStr(revision, ")") - 1) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
54 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
55 |
End Select |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
56 |
|
10829 | 57 |
UpdateFile modified, revision, version, cur_date, "../src/rev.cpp" |
58 |
UpdateFile modified, revision, version, cur_date, "../src/ottdres.rc" |
|
9703 | 59 |
End Sub |
60 |
||
9826
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
61 |
Function ReadRegistryKey(shive, subkey, valuename, architecture) |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
62 |
Dim hiveKey, objCtx, objLocator, objServices, objReg, Inparams, Outparams |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
63 |
|
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
64 |
' First, get the Registry Provider for the requested architecture |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
65 |
Set objCtx = CreateObject("WbemScripting.SWbemNamedValueSet") |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
66 |
objCtx.Add "__ProviderArchitecture", architecture ' Must be 64 of 32 |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
67 |
Set objLocator = CreateObject("Wbemscripting.SWbemLocator") |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
68 |
Set objServices = objLocator.ConnectServer("","root\default","","",,,,objCtx) |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
69 |
Set objReg = objServices.Get("StdRegProv") |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
70 |
|
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
71 |
' Check the hive and give it the right value |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
72 |
Select Case shive |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
73 |
Case "HKCR", "HKEY_CLASSES_ROOT" |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
74 |
hiveKey = &h80000000 |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
75 |
Case "HKCU", "HKEY_CURRENT_USER" |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
76 |
hiveKey = &H80000001 |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
77 |
Case "HKLM", "HKEY_LOCAL_MACHINE" |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
78 |
hiveKey = &h80000002 |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
79 |
Case "HKU", "HKEY_USERS" |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
80 |
hiveKey = &h80000003 |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
81 |
Case "HKCC", "HKEY_CURRENT_CONFIG" |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
82 |
hiveKey = &h80000005 |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
83 |
Case "HKDD", "HKEY_DYN_DATA" ' Only valid for Windows 95/98 |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
84 |
hiveKey = &h80000006 |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
85 |
Case Else |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
86 |
MsgBox "Hive not valid (ReadRegistryKey)" |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
87 |
End Select |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
88 |
|
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
89 |
Set Inparams = objReg.Methods_("GetStringValue").Inparameters |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
90 |
Inparams.Hdefkey = hiveKey |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
91 |
Inparams.Ssubkeyname = subkey |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
92 |
Inparams.Svaluename = valuename |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
93 |
Set Outparams = objReg.ExecMethod_("GetStringValue", Inparams,,objCtx) |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
94 |
|
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
95 |
ReadRegistryKey = Outparams.SValue |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
96 |
End Function |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
97 |
|
9703 | 98 |
Function DetermineSVNVersion() |
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
99 |
Dim WshShell, version, url, oExec, line |
9703 | 100 |
Set WshShell = CreateObject("WScript.Shell") |
101 |
On Error Resume Next |
|
102 |
||
103 |
' Try TortoiseSVN |
|
104 |
' Get the directory where TortoiseSVN (should) reside(s) |
|
105 |
Dim sTortoise |
|
9826
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
106 |
' First, try with 32-bit architecture |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
107 |
sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 32) |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
108 |
If sTortoise = Nothing Then |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
109 |
' No 32-bit version of TortoiseSVN installed, try 64-bit version (doesn't hurt on 32-bit machines, it returns nothing or is ignored) |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
110 |
sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 64) |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
111 |
End If |
9703 | 112 |
|
9826
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
113 |
' If TortoiseSVN is installed, try to get the revision number |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
114 |
If sTortoise <> Nothing Then |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
115 |
Dim file |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
116 |
' Write some "magic" to a temporary file so we can acquire the svn revision/state |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
117 |
Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0) |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
118 |
file.WriteLine "r$WCREV$$WCMODS?M:$" |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
119 |
file.WriteLine "$WCURL$" |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
120 |
file.Close |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
121 |
Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp") |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
122 |
' Wait till the application is finished ... |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
123 |
Do |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
124 |
OExec.StdOut.ReadLine() |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
125 |
Loop While Not OExec.StdOut.atEndOfStream |
9703 | 126 |
|
9826
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
127 |
Set file = FSO.OpenTextFile("tsvn_tmp", 1, 0, 0) |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
128 |
version = file.ReadLine |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
129 |
url = file.ReadLine |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
130 |
file.Close |
9703 | 131 |
|
9826
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
132 |
Set file = FSO.GetFile("tsvn_tmp") |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
133 |
file.Delete |
9707ad4c9b60
(svn r12462) [NoAI] -Sync: with trunk r12304:12461.
rubidium
parents:
9723
diff
changeset
|
134 |
End If |
9703 | 135 |
|
136 |
' Looks like there is no TortoiseSVN installed either. Then we don't know it. |
|
137 |
If InStr(version, "$") Then |
|
138 |
' Reset error and version |
|
139 |
Err.Clear |
|
140 |
version = "norev000" |
|
141 |
' Do we have subversion installed? Check immediatelly whether we've got a modified WC. |
|
142 |
Set oExec = WshShell.Exec("svnversion ../src") |
|
143 |
If Err.Number = 0 Then |
|
144 |
Dim modified |
|
145 |
If InStr(OExec.StdOut.ReadLine(), "M") Then |
|
146 |
modified = "M" |
|
147 |
Else |
|
148 |
modified = "" |
|
149 |
End If |
|
150 |
||
151 |
' Set the environment to english |
|
152 |
WshShell.Environment("PROCESS")("LANG") = "en" |
|
153 |
||
154 |
' And use svn info to get the correct revision and branch information. |
|
155 |
Set oExec = WshShell.Exec("svn info ../src") |
|
156 |
If Err.Number = 0 Then |
|
157 |
Do |
|
158 |
line = OExec.StdOut.ReadLine() |
|
159 |
If InStr(line, "URL") Then |
|
160 |
url = line |
|
161 |
End If |
|
162 |
If InStr(line, "Last Changed Rev") Then |
|
163 |
version = "r" & Mid(line, 19) & modified |
|
164 |
End If |
|
165 |
Loop While Not OExec.StdOut.atEndOfStream |
|
166 |
End If |
|
167 |
End If |
|
168 |
End If |
|
169 |
||
170 |
If version <> "norev000" Then |
|
171 |
If InStr(url, "branches") Then |
|
172 |
url = Mid(url, InStr(url, "branches") + 8) |
|
173 |
url = Mid(url, 1, InStr(2, url, "/") - 1) |
|
174 |
version = version & Replace(url, "/", "-") |
|
175 |
End If |
|
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
176 |
Else |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
177 |
' svn detection failed, reset error and try git |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
178 |
Err.Clear |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
179 |
Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD") |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
180 |
If Err.Number = 0 Then |
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
181 |
version = "g" & oExec.StdOut.ReadLine() |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
182 |
Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src") |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
183 |
Do While oExec.Status = 0 And Err.Number = 0 |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
184 |
Loop |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
185 |
If Err.Number = 0 And oExec.ExitCode = 1 Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
186 |
version = version & "M" |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
187 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
188 |
|
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
189 |
Set oExec = WshShell.Exec("git symbolic-ref HEAD") |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
190 |
If Err.Number = 0 Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
191 |
line = oExec.StdOut.ReadLine() |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
192 |
line = Mid(line, InStrRev(line, "/")+1) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
193 |
If line <> "master" Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
194 |
version = version & "-" & line |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
195 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
196 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
197 |
Else |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
198 |
' try mercurial (hg) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
199 |
Err.Clear |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
200 |
Set oExec = WshShell.Exec("hg tip") |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
201 |
If Err.Number = 0 Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
202 |
version = "h" & Mid(OExec.StdOut.ReadLine(), 19, 8) |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
203 |
Set oExec = WshShell.Exec("hg status ../src") |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
204 |
If Err.Number = 0 Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
205 |
Do |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
206 |
line = OExec.StdOut.ReadLine() |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
207 |
If Mid(line, 1, 1) <> "?" Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
208 |
version = version & "M" |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
209 |
Exit Do |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
210 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
211 |
Loop While Not OExec.StdOut.atEndOfStream |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
212 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
213 |
Set oExec = WshShell.Exec("hg branch") |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
214 |
If Err.Number = 0 Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
215 |
line = OExec.StdOut.ReadLine() |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
216 |
If line <> "default" Then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
217 |
version = version & "-" & line |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
218 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
219 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
220 |
End If |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9703
diff
changeset
|
221 |
End If |
9703 | 222 |
End If |
223 |
||
224 |
DetermineSVNVersion = version |
|
225 |
End Function |
|
226 |
||
227 |
Function IsCachedVersion(version) |
|
228 |
Dim cache_file, cached_version |
|
229 |
cached_version = "" |
|
230 |
Set cache_file = FSO.OpenTextFile("../config.cache.version", 1, True, 0) |
|
231 |
If Not cache_file.atEndOfStream Then |
|
232 |
cached_version = cache_file.ReadLine() |
|
233 |
End If |
|
234 |
cache_file.Close |
|
235 |
||
236 |
If version <> cached_version Then |
|
237 |
Set cache_file = fso.CreateTextFile("../config.cache.version", True) |
|
238 |
cache_file.WriteLine(version) |
|
239 |
cache_file.Close |
|
240 |
IsCachedVersion = False |
|
241 |
Else |
|
242 |
IsCachedVersion = True |
|
243 |
End If |
|
244 |
End Function |
|
245 |
||
246 |
Dim version |
|
247 |
version = DetermineSVNVersion |
|
248 |
If Not (IsCachedVersion(version) And FSO.FileExists("../src/rev.cpp") And FSO.FileExists("../src/ottdres.rc")) Then |
|
249 |
UpdateFiles version |
|
250 |
End If |