author | skidd13 |
Sun, 02 Dec 2007 21:43:16 +0000 | |
changeset 8004 | 1c54bc6f4bdf |
parent 7975 | d8f22e2ece0c |
child 8702 | 4488c1576a68 |
permissions | -rw-r--r-- |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
1 |
Option Explicit |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
2 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
3 |
Dim FSO |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
4 |
Set FSO = CreateObject("Scripting.FileSystemObject") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
5 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
6 |
Sub FindReplaceInFile(filename, to_find, replacement) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
7 |
Dim file, data |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
8 |
Set file = FSO.OpenTextFile(filename, 1, 0, 0) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
9 |
data = file.ReadAll |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
10 |
file.Close |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
11 |
data = Replace(data, to_find, replacement) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
12 |
Set file = FSO.CreateTextFile(FileName, -1, 0) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
13 |
file.Write data |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
14 |
file.Close |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
15 |
End Sub |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
16 |
|
7780
12ef69de4e60
(svn r11330) -Add: OTTD version checking for NewGRFs. This allows NewGRFs to do something different for different versions of OpenTTD, like disabling it for too low versions or loading different graphics.
rubidium
parents:
7565
diff
changeset
|
17 |
Sub UpdateFile(revision, version, cur_date, filename) |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
18 |
FSO.CopyFile filename & ".in", filename |
7780
12ef69de4e60
(svn r11330) -Add: OTTD version checking for NewGRFs. This allows NewGRFs to do something different for different versions of OpenTTD, like disabling it for too low versions or loading different graphics.
rubidium
parents:
7565
diff
changeset
|
19 |
FindReplaceInFile filename, "@@REVISION@@", revision |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
20 |
FindReplaceInFile filename, "@@VERSION@@", version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
21 |
FindReplaceInFile filename, "@@DATE@@", cur_date |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
22 |
End Sub |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
23 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
24 |
Sub UpdateFiles(version) |
7784 | 25 |
Dim WshShell, cur_date, revision, oExec |
26 |
Set WshShell = CreateObject("WScript.Shell") |
|
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
27 |
cur_date = DatePart("D", Date) & "." & DatePart("M", Date) & "." & DatePart("YYYY", Date) |
7784 | 28 |
revision = 0 |
29 |
Select Case Mid(version, 1, 1) |
|
30 |
Case "r" ' svn |
|
31 |
revision = Mid(version, 2) |
|
32 |
If InStr(revision, "M") Then |
|
33 |
revision = Mid(revision, 1, InStr(revision, "M") - 1) |
|
34 |
End If |
|
35 |
If InStr(revision, "-") Then |
|
36 |
revision = Mid(revision, 1, InStr(revision, "-") - 1) |
|
37 |
End If |
|
38 |
Case "h" ' mercurial (hg) |
|
39 |
Set oExec = WshShell.Exec("hg log -k " & Chr(34) & "svn" & Chr(34) & " -l 1 --template " & Chr(34) & "{desc}\n" & Chr(34) & " ../src") |
|
40 |
If Err.Number = 0 Then |
|
41 |
revision = Mid(OExec.StdOut.ReadLine(), 7) |
|
42 |
revision = Mid(revision, 1, InStr(revision, ")") - 1) |
|
43 |
End If |
|
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
44 |
Case "g" ' git |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
45 |
Set oExec = WshShell.Exec("git log --pretty=format:%s --grep=" & Chr(34) & "^(svn r[0-9]*)" & Chr(34) & " -1 ../src") |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
46 |
if Err.Number = 0 Then |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
47 |
revision = Mid(oExec.StdOut.ReadLine(), 7) |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
48 |
revision = Mid(revision, 1, InStr(revision, ")") - 1) |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
49 |
End If |
7784 | 50 |
End Select |
7780
12ef69de4e60
(svn r11330) -Add: OTTD version checking for NewGRFs. This allows NewGRFs to do something different for different versions of OpenTTD, like disabling it for too low versions or loading different graphics.
rubidium
parents:
7565
diff
changeset
|
51 |
|
12ef69de4e60
(svn r11330) -Add: OTTD version checking for NewGRFs. This allows NewGRFs to do something different for different versions of OpenTTD, like disabling it for too low versions or loading different graphics.
rubidium
parents:
7565
diff
changeset
|
52 |
UpdateFile revision, version, cur_date, "../src/rev.cpp" |
12ef69de4e60
(svn r11330) -Add: OTTD version checking for NewGRFs. This allows NewGRFs to do something different for different versions of OpenTTD, like disabling it for too low versions or loading different graphics.
rubidium
parents:
7565
diff
changeset
|
53 |
UpdateFile revision, version, cur_date, "../src/ottdres.rc" |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
54 |
End Sub |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
55 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
56 |
Function DetermineSVNVersion() |
7784 | 57 |
Dim WshShell, version, url, oExec, line |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
58 |
Set WshShell = CreateObject("WScript.Shell") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
59 |
On Error Resume Next |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
60 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
61 |
' Try TortoiseSVN |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
62 |
' Get the directory where TortoiseSVN (should) reside(s) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
63 |
Dim sTortoise |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
64 |
sTortoise = WshShell.RegRead("HKLM\SOFTWARE\TortoiseSVN\Directory") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
65 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
66 |
Dim file |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
67 |
' Write some "magic" to a temporary file so we can acquire the svn revision/state |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
68 |
Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0) |
7565
a7ce188ec44e
(svn r11090) -Fix (r11089): incorrect version format and failure with paths containing spaces
glx
parents:
7564
diff
changeset
|
69 |
file.WriteLine "r$WCREV$$WCMODS?M:$" |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
70 |
file.WriteLine "$WCURL$" |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
71 |
file.Close |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
72 |
Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
73 |
' Wait till the application is finished ... |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
74 |
Do |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
75 |
OExec.StdOut.ReadLine() |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
76 |
Loop While Not OExec.StdOut.atEndOfStream |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
77 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
78 |
Set file = FSO.OpenTextFile("tsvn_tmp", 1, 0, 0) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
79 |
version = file.ReadLine |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
80 |
url = file.ReadLine |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
81 |
file.Close |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
82 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
83 |
Set file = FSO.GetFile("tsvn_tmp") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
84 |
file.Delete |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
85 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
86 |
' Looks like there is no TortoiseSVN installed either. Then we don't know it. |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
87 |
If InStr(version, "$") Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
88 |
' Reset error and version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
89 |
Err.Clear |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
90 |
version = "norev000" |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
91 |
' Do we have subversion installed? Check immediatelly whether we've got a modified WC. |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
92 |
Set oExec = WshShell.Exec("svnversion ../src") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
93 |
If Err.Number = 0 Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
94 |
Dim modified |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
95 |
If InStr(OExec.StdOut.ReadLine(), "M") Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
96 |
modified = "M" |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
97 |
Else |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
98 |
modified = "" |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
99 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
100 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
101 |
' Set the environment to english |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
102 |
WshShell.Environment("PROCESS")("LANG") = "en" |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
103 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
104 |
' And use svn info to get the correct revision and branch information. |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
105 |
Set oExec = WshShell.Exec("svn info ../src") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
106 |
If Err.Number = 0 Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
107 |
Do |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
108 |
line = OExec.StdOut.ReadLine() |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
109 |
If InStr(line, "URL") Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
110 |
url = line |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
111 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
112 |
If InStr(line, "Last Changed Rev") Then |
7565
a7ce188ec44e
(svn r11090) -Fix (r11089): incorrect version format and failure with paths containing spaces
glx
parents:
7564
diff
changeset
|
113 |
version = "r" & Mid(line, 19) & modified |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
114 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
115 |
Loop While Not OExec.StdOut.atEndOfStream |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
116 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
117 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
118 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
119 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
120 |
If version <> "norev000" Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
121 |
If InStr(url, "branches") Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
122 |
url = Mid(url, InStr(url, "branches") + 8) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
123 |
url = Mid(url, 1, InStr(2, url, "/") - 1) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
124 |
version = version & Replace(url, "/", "-") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
125 |
End If |
7784 | 126 |
Else |
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
127 |
' svn detection failed, reset error and try git |
7784 | 128 |
Err.Clear |
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
129 |
Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD") |
7975
d8f22e2ece0c
(svn r11531) -Fix [FS#1459]: version determination did stall (read: never finish) when both svn and git were not installed.
rubidium
parents:
7917
diff
changeset
|
130 |
If Err.Number = 0 Then |
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
131 |
version = "g" & oExec.StdOut.ReadLine() |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
132 |
Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src") |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
133 |
Do While oExec.Status = 0 And Err.Number = 0 |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
134 |
Loop |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
135 |
If Err.Number = 0 And oExec.ExitCode = 1 Then |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
136 |
version = version & "M" |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
137 |
End If |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
138 |
|
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
139 |
Set oExec = WshShell.Exec("git symbolic-ref HEAD") |
7784 | 140 |
If Err.Number = 0 Then |
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
141 |
line = oExec.StdOut.ReadLine() |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
142 |
line = Mid(line, InStrRev(line, "/")+1) |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
143 |
If line <> "master" Then |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
144 |
version = version & "-" & line |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
145 |
End If |
7784 | 146 |
End If |
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
147 |
Else |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
148 |
' try mercurial (hg) |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
149 |
Err.Clear |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
150 |
Set oExec = WshShell.Exec("hg tip") |
7784 | 151 |
If Err.Number = 0 Then |
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
152 |
version = "h" & Mid(OExec.StdOut.ReadLine(), 19, 8) |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
153 |
Set oExec = WshShell.Exec("hg status ../src") |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
154 |
If Err.Number = 0 Then |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
155 |
Do |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
156 |
line = OExec.StdOut.ReadLine() |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
157 |
If Mid(line, 1, 1) <> "?" Then |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
158 |
version = version & "M" |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
159 |
Exit Do |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
160 |
End If |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
161 |
Loop While Not OExec.StdOut.atEndOfStream |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
162 |
End If |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
163 |
Set oExec = WshShell.Exec("hg branch") |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
164 |
If Err.Number = 0 Then |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
165 |
line = OExec.StdOut.ReadLine() |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
166 |
If line <> "default" Then |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
167 |
version = version & "-" & line |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
168 |
End If |
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
169 |
End If |
7784 | 170 |
End If |
171 |
End If |
|
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
172 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
173 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
174 |
DetermineSVNVersion = version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
175 |
End Function |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
176 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
177 |
Function IsCachedVersion(version) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
178 |
Dim cache_file, cached_version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
179 |
cached_version = "" |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
180 |
Set cache_file = FSO.OpenTextFile("../config.cache.version", 1, True, 0) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
181 |
If Not cache_file.atEndOfStream Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
182 |
cached_version = cache_file.ReadLine() |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
183 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
184 |
cache_file.Close |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
185 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
186 |
If version <> cached_version Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
187 |
Set cache_file = fso.CreateTextFile("../config.cache.version", True) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
188 |
cache_file.WriteLine(version) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
189 |
cache_file.Close |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
190 |
IsCachedVersion = False |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
191 |
Else |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
192 |
IsCachedVersion = True |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
193 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
194 |
End Function |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
195 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
196 |
Dim version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
197 |
version = DetermineSVNVersion |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
198 |
If Not (IsCachedVersion(version) And FSO.FileExists("../src/rev.cpp") And FSO.FileExists("../src/ottdres.rc")) Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
199 |
UpdateFiles version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
200 |
End If |