author | glx |
Tue, 16 Dec 2008 23:02:22 +0000 | |
changeset 10431 | 13946af4ff98 |
parent 10293 | 1a3d4946ac21 |
permissions | -rwxr-xr-x |
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) |
9783
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
12 |
Set file = FSO.CreateTextFile(filename, -1, 0) |
7564
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 |
|
9457
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
8702
diff
changeset
|
17 |
Sub UpdateFile(modified, 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 |
9457
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
8702
diff
changeset
|
19 |
FindReplaceInFile filename, "@@MODIFIED@@", modified |
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
|
20 |
FindReplaceInFile filename, "@@REVISION@@", revision |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
21 |
FindReplaceInFile filename, "@@VERSION@@", version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
22 |
FindReplaceInFile filename, "@@DATE@@", cur_date |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
23 |
End Sub |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
24 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
25 |
Sub UpdateFiles(version) |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
26 |
Dim modified, revision, cur_date |
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) |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
28 |
|
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
29 |
If InStr(version, Chr(9)) Then |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
30 |
revision = Mid(version, InStr(version, Chr(9)) + 1) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
31 |
revision = Mid(revision, 1, InStr(revision, Chr(9)) - 1) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
32 |
modified = Mid(version, InStrRev(version, Chr(9)) + 1) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
33 |
version = Mid(version, 1, InStr(version, Chr(9)) - 1) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
34 |
Else |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
35 |
revision = 0 |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
36 |
modified = 1 |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
37 |
End If |
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
|
38 |
|
9457
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
8702
diff
changeset
|
39 |
UpdateFile modified, revision, version, cur_date, "../src/rev.cpp" |
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
8702
diff
changeset
|
40 |
UpdateFile modified, revision, version, cur_date, "../src/ottdres.rc" |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
41 |
End Sub |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
42 |
|
8702
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
43 |
Function ReadRegistryKey(shive, subkey, valuename, architecture) |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
44 |
Dim hiveKey, objCtx, objLocator, objServices, objReg, Inparams, Outparams |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
45 |
|
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
46 |
' First, get the Registry Provider for the requested architecture |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
47 |
Set objCtx = CreateObject("WbemScripting.SWbemNamedValueSet") |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
48 |
objCtx.Add "__ProviderArchitecture", architecture ' Must be 64 of 32 |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
49 |
Set objLocator = CreateObject("Wbemscripting.SWbemLocator") |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
50 |
Set objServices = objLocator.ConnectServer("","root\default","","",,,,objCtx) |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
51 |
Set objReg = objServices.Get("StdRegProv") |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
52 |
|
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
53 |
' Check the hive and give it the right value |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
54 |
Select Case shive |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
55 |
Case "HKCR", "HKEY_CLASSES_ROOT" |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
56 |
hiveKey = &h80000000 |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
57 |
Case "HKCU", "HKEY_CURRENT_USER" |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
58 |
hiveKey = &H80000001 |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
59 |
Case "HKLM", "HKEY_LOCAL_MACHINE" |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
60 |
hiveKey = &h80000002 |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
61 |
Case "HKU", "HKEY_USERS" |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
62 |
hiveKey = &h80000003 |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
63 |
Case "HKCC", "HKEY_CURRENT_CONFIG" |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
64 |
hiveKey = &h80000005 |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
65 |
Case "HKDD", "HKEY_DYN_DATA" ' Only valid for Windows 95/98 |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
66 |
hiveKey = &h80000006 |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
67 |
Case Else |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
68 |
MsgBox "Hive not valid (ReadRegistryKey)" |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
69 |
End Select |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
70 |
|
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
71 |
Set Inparams = objReg.Methods_("GetStringValue").Inparameters |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
72 |
Inparams.Hdefkey = hiveKey |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
73 |
Inparams.Ssubkeyname = subkey |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
74 |
Inparams.Svaluename = valuename |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
75 |
Set Outparams = objReg.ExecMethod_("GetStringValue", Inparams,,objCtx) |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
76 |
|
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
77 |
ReadRegistryKey = Outparams.SValue |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
78 |
End Function |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
79 |
|
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
80 |
Function DetermineSVNVersion() |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
81 |
Dim WshShell, version, branch, modified, revision, url, oExec, line, hash |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
82 |
Set WshShell = CreateObject("WScript.Shell") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
83 |
On Error Resume Next |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
84 |
|
10431
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
85 |
revision = 0 |
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
86 |
|
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
87 |
' Try TortoiseSVN |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
88 |
' Get the directory where TortoiseSVN (should) reside(s) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
89 |
Dim sTortoise |
8702
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
90 |
' First, try with 32-bit architecture |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
91 |
sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 32) |
10431
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
92 |
If sTortoise = "" Then |
8702
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
93 |
' No 32-bit version of TortoiseSVN installed, try 64-bit version (doesn't hurt on 32-bit machines, it returns nothing or is ignored) |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
94 |
sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 64) |
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
95 |
End If |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
96 |
|
8702
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
97 |
' If TortoiseSVN is installed, try to get the revision number |
10431
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
98 |
If sTortoise <> "" Then |
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
99 |
Dim SubWCRev |
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
100 |
Set SubWCRev = WScript.CreateObject("SubWCRev.object") |
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
101 |
SubWCRev.GetWCInfo FSO.GetAbsolutePathName("../src"), 0, 0 |
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
102 |
revision = SubWCRev.Revision |
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
103 |
version = "r" & revision |
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
104 |
modified = 0 |
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
105 |
if SubWCRev.HasModifications then modified = 2 |
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
106 |
url = SubWCRev.Url |
8702
4488c1576a68
(svn r12375) -Fix [FS#1847]: revision detection failed to detect 64bit TortoiseSVN when ran from a 32bit MSVC on win64 system (Jafinto)
glx
parents:
7975
diff
changeset
|
107 |
End If |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
108 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
109 |
' Looks like there is no TortoiseSVN installed either. Then we don't know it. |
10431
13946af4ff98
(svn r14684) -Codechange: use SubWCRev object to get version info instead SubWCRev.exe for tortoiseSVN (Darkvater)
glx
parents:
10293
diff
changeset
|
110 |
If revision = 0 Then |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
111 |
' Reset error and version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
112 |
Err.Clear |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
113 |
version = "norev000" |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
114 |
modified = 0 |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
115 |
|
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
116 |
' Set the environment to english |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
117 |
WshShell.Environment("PROCESS")("LANG") = "en" |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
118 |
|
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
119 |
' 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
|
120 |
Set oExec = WshShell.Exec("svnversion ../src") |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
121 |
If Err.Number = 0 Then |
9783
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
122 |
' Wait till the application is finished ... |
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
123 |
Do While oExec.Status = 0 |
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
124 |
Loop |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
125 |
|
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
126 |
line = OExec.StdOut.ReadLine() |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
127 |
If line <> "exported" Then |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
128 |
If InStr(line, "M") Then |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
129 |
modified = 2 |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
130 |
End If |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
131 |
|
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
132 |
' And use svn info to get the correct revision and branch information. |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
133 |
Set oExec = WshShell.Exec("svn info ../src") |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
134 |
If Err.Number = 0 Then |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
135 |
Do |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
136 |
line = OExec.StdOut.ReadLine() |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
137 |
If InStr(line, "URL") Then |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
138 |
url = line |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
139 |
End If |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
140 |
If InStr(line, "Last Changed Rev") Then |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
141 |
revision = Mid(line, 19) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
142 |
version = "r" & revision |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
143 |
End If |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
144 |
Loop While Not OExec.StdOut.atEndOfStream |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
145 |
End If ' Err.Number = 0 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
146 |
End If ' line <> "exported" |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
147 |
End If ' Err.Number = 0 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
148 |
End If ' InStr(version, "$") |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
149 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
150 |
If version <> "norev000" Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
151 |
If InStr(url, "branches") Then |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
152 |
url = Mid(url, InStr(url, "branches/") + 9) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
153 |
branch = Mid(url, 1, InStr(2, url, "/") - 1) |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
154 |
End If |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
155 |
Else ' version <> "norev000" |
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
156 |
' svn detection failed, reset error and try git |
7784 | 157 |
Err.Clear |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
158 |
Set oExec = WshShell.Exec("git rev-parse --verify 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
|
159 |
If Err.Number = 0 Then |
9783
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
160 |
' Wait till the application is finished ... |
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
161 |
Do While oExec.Status = 0 |
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
162 |
Loop |
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
163 |
|
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
164 |
If oExec.ExitCode = 0 Then |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
165 |
hash = oExec.StdOut.ReadLine() |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
166 |
version = "g" & Mid(hash, 1, 8) |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
167 |
Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src") |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
168 |
If Err.Number = 0 Then |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
169 |
' Wait till the application is finished ... |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
170 |
Do While oExec.Status = 0 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
171 |
Loop |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
172 |
|
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
173 |
If oExec.ExitCode = 1 Then |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
174 |
modified = 2 |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
175 |
End If ' oExec.ExitCode = 1 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
176 |
|
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
177 |
Set oExec = WshShell.Exec("git symbolic-ref HEAD") |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
178 |
If Err.Number = 0 Then |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
179 |
line = oExec.StdOut.ReadLine() |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
180 |
line = Mid(line, InStrRev(line, "/") + 1) |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
181 |
If line <> "master" Then |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
182 |
branch = line |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
183 |
End If ' line <> "master" |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
184 |
End If ' Err.Number = 0 |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
185 |
|
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
186 |
Set oExec = WshShell.Exec("git log --pretty=format:%s --grep=" & Chr(34) & "^(svn r[0-9]*)" & Chr(34) & " -1 ../src") |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
187 |
if Err.Number = 0 Then |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
188 |
revision = Mid(oExec.StdOut.ReadLine(), 7) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
189 |
revision = Mid(revision, 1, InStr(revision, ")") - 1) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
190 |
End If ' Err.Number = 0 |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
191 |
End If ' Err.Number = 0 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
192 |
End If ' oExec.ExitCode = 0 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
193 |
End If ' Err.Number = 0 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
194 |
|
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
195 |
If version = "norev000" Then |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
196 |
' git detection failed, reset error and try mercurial (hg) |
7917
e6b7897c5a00
(svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents:
7784
diff
changeset
|
197 |
Err.Clear |
10163
236f4cd3aeca
(svn r14354) -Fix (r14253): also fix hg revision detection for MSVC
glx
parents:
10074
diff
changeset
|
198 |
Set oExec = WshShell.Exec("hg parents") |
7784 | 199 |
If Err.Number = 0 Then |
9783
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
200 |
' Wait till the application is finished ... |
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
201 |
Do While oExec.Status = 0 |
4e3ca2698436
(svn r13924) -Fix (r11531): determineversion.vbs could fail to find the right version with hg
glx
parents:
9457
diff
changeset
|
202 |
Loop |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
203 |
|
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
204 |
If oExec.ExitCode = 0 Then |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
205 |
line = OExec.StdOut.ReadLine() |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
206 |
hash = Mid(line, InStrRev(line, ":") + 1) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
207 |
version = "h" & Mid(hash, 1, 8) |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
208 |
Set oExec = WshShell.Exec("hg status ../src") |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
209 |
If Err.Number = 0 Then |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
210 |
Do |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
211 |
line = OExec.StdOut.ReadLine() |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
212 |
If Len(line) > 0 And Mid(line, 1, 1) <> "?" Then |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
213 |
modified = 2 |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
214 |
Exit Do |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
215 |
End If ' Len(line) > 0 And Mid(line, 1, 1) <> "?" |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
216 |
Loop While Not OExec.StdOut.atEndOfStream |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
217 |
|
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
218 |
Set oExec = WshShell.Exec("hg branch") |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
219 |
If Err.Number = 0 Then |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
220 |
line = OExec.StdOut.ReadLine() |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
221 |
If line <> "default" Then |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
222 |
branch = line |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
223 |
End If ' line <> "default" |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
224 |
End If ' Err.Number = 0 |
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
225 |
|
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
226 |
Set oExec = WshShell.Exec("hg log -r " & hash & ":0 -k " & Chr(34) & "svn" & Chr(34) & " -l 1 --template " & Chr(34) & "{desc}\n" & Chr(34) & " ../src") |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
227 |
If Err.Number = 0 Then |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
228 |
revision = Mid(OExec.StdOut.ReadLine(), 7) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
229 |
revision = Mid(revision, 1, InStr(revision, ")") - 1) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
230 |
End If ' Err.Number = 0 |
10074
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
231 |
End If ' Err.Number = 0 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
232 |
End If ' oExec.ExitCode = 0 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
233 |
End If ' Err.Number = 0 |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
234 |
End If ' version = "norev000" |
d6bf81ae7d87
(svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents:
10035
diff
changeset
|
235 |
End If ' version <> "norev000" |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
236 |
|
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
237 |
If modified = 2 Then |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
238 |
version = version & "M" |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
239 |
End If |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
240 |
|
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
241 |
If branch <> "" Then |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
242 |
version = version & "-" & branch |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
243 |
End If |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
244 |
|
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
245 |
If version <> "norev000" Then |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
246 |
DetermineSVNVersion = version & Chr(9) & revision & Chr(9) & modified |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
247 |
Else |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
248 |
DetermineSVNVersion = version |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
249 |
End If |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
250 |
End Function |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
251 |
|
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
252 |
Function IsCachedVersion(ByVal version) |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
253 |
Dim cache_file, cached_version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
254 |
cached_version = "" |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
255 |
Set cache_file = FSO.OpenTextFile("../config.cache.version", 1, True, 0) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
256 |
If Not cache_file.atEndOfStream Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
257 |
cached_version = cache_file.ReadLine() |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
258 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
259 |
cache_file.Close |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
260 |
|
10283
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
261 |
If InStr(version, Chr(9)) Then |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
262 |
version = Mid(version, 1, Instr(version, Chr(9)) - 1) |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
263 |
End If |
1b930adacb11
(svn r14522) -Fix: apply r14519 to determineversion.vbs. Also properly set 'modified' for hg and git (was always 1).
glx
parents:
10164
diff
changeset
|
264 |
|
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
265 |
If version <> cached_version Then |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
266 |
Set cache_file = fso.CreateTextFile("../config.cache.version", True) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
267 |
cache_file.WriteLine(version) |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
268 |
cache_file.Close |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
269 |
IsCachedVersion = False |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
270 |
Else |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
271 |
IsCachedVersion = True |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
272 |
End If |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
273 |
End Function |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
274 |
|
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
275 |
Dim version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
276 |
version = DetermineSVNVersion |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
277 |
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
|
278 |
UpdateFiles version |
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff
changeset
|
279 |
End If |