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