projects/determineversion.vbs
author translators
Mon, 01 Dec 2008 18:28:44 +0000
changeset 10396 7f6f37c9dc67
parent 10293 1a3d4946ac21
child 10431 13946af4ff98
permissions -rwxr-xr-x
(svn r14647) -Update: WebTranslator2 update to 2008-12-01 18:28:38
croatian - 160 changed by knovak (160)
hungarian - 2 changed by oklmernok (2)
malay - 20 fixed by SeaGates (20)
spanish - 1 fixed by eusebio (1)
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
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
    85
	' Try TortoiseSVN
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
    86
	' Get the directory where TortoiseSVN (should) reside(s)
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
    87
	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
    88
	' 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
    89
	sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 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
    90
	If sTortoise = Nothing Then
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
		' 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
    92
		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
    93
	End If
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
    94
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
    95
	' If TortoiseSVN is installed, try to get the revision number
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
    96
	If sTortoise <> Nothing Then
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
		Dim file
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
    98
		' Write some "magic" to a temporary file so we can acquire the svn revision/state
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
    99
		Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0)
10293
1a3d4946ac21 (svn r14532) -Fix (r14522): one 'M' is enough to show modified version
glx
parents: 10283
diff changeset
   100
		file.WriteLine "r$WCREV$"
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
   101
		file.WriteLine "$WCURL$"
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
   102
		file.WriteLine "$WCMODS?2: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
   103
		file.WriteLine "$WCREV$"
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
   104
		file.Close
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
   105
		Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp")
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
   106
		' Wait till the application is finished ...
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
		Do
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
   108
			OExec.StdOut.ReadLine()
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
   109
		Loop While Not OExec.StdOut.atEndOfStream
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   110
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
   111
		Set file = FSO.OpenTextFile("tsvn_tmp", 1, 0, 0)
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
   112
		version = file.ReadLine
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
   113
		url = file.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
   114
		modified = file.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
   115
		revision = file.ReadLine
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
   116
		file.Close
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   117
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
   118
		Set file = FSO.GetFile("tsvn_tmp")
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
   119
		file.Delete
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
   120
	End If
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   121
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   122
	' 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
   123
	If InStr(version, "$") Then
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   124
		' Reset error and version
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   125
		Err.Clear
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   126
		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
   127
		modified = 0
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   128
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   129
		' Set the environment to english
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   130
		WshShell.Environment("PROCESS")("LANG") = "en"
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   131
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   132
		' 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
   133
		Set oExec = WshShell.Exec("svnversion ../src")
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   134
		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
   135
			' 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
   136
			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
   137
			Loop
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   138
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   139
			line = OExec.StdOut.ReadLine()
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   140
			If line <> "exported" Then
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   141
				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
   142
					modified = 2
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
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   145
				' 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
   146
				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
   147
				If Err.Number = 0 Then
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   148
					Do
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   149
						line = OExec.StdOut.ReadLine()
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   150
						If InStr(line, "URL") Then
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   151
							url = line
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   152
						End If
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   153
						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
   154
							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
   155
							version = "r" & revision
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   156
						End If
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   157
					Loop While Not OExec.StdOut.atEndOfStream
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   158
				End If ' Err.Number = 0
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   159
			End If ' line <> "exported"
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   160
		End If ' Err.Number = 0
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   161
	End If ' InStr(version, "$")
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   162
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   163
	If version <> "norev000" Then
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   164
		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
   165
			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
   166
			branch = Mid(url, 1, InStr(2, url, "/") - 1)
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   167
		End If
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   168
	Else ' version <> "norev000"
7917
e6b7897c5a00 (svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents: 7784
diff changeset
   169
		' svn detection failed, reset error and try git
7784
94d15bc396ce (svn r11334) -Codechange: add hg detection to MSVC
glx
parents: 7780
diff changeset
   170
		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
   171
		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
   172
		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
   173
			' 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
   174
			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
   175
			Loop
7917
e6b7897c5a00 (svn r11470) -Codechange: add git detection to MSVC (michi_cc)
glx
parents: 7784
diff changeset
   176
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   177
			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
   178
				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
   179
				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
   180
				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
   181
				If Err.Number = 0 Then
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   182
					' Wait till the application is finished ...
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   183
					Do While oExec.Status = 0
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   184
					Loop
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   185
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   186
					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
   187
						modified = 2
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   188
					End If ' oExec.ExitCode = 1
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   189
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   190
					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
   191
					If Err.Number = 0 Then
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   192
						line = oExec.StdOut.ReadLine()
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   193
						line = Mid(line, InStrRev(line, "/") + 1)
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   194
						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
   195
							branch = line
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   196
						End If ' line <> "master"
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   197
					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
   198
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
   199
					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
   200
					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
   201
						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
   202
						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
   203
					End If ' Err.Number = 0
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   204
				End If ' Err.Number = 0
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   205
			End If ' oExec.ExitCode = 0
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   206
		End If ' Err.Number = 0
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   207
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   208
		If version = "norev000" Then
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   209
			' 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
   210
			Err.Clear
10163
236f4cd3aeca (svn r14354) -Fix (r14253): also fix hg revision detection for MSVC
glx
parents: 10074
diff changeset
   211
			Set oExec = WshShell.Exec("hg parents")
7784
94d15bc396ce (svn r11334) -Codechange: add hg detection to MSVC
glx
parents: 7780
diff changeset
   212
			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
   213
				' 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
   214
				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
   215
				Loop
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   216
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   217
				If oExec.ExitCode = 0 Then
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   218
					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
   219
					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
   220
					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
   221
					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
   222
					If Err.Number = 0 Then
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   223
						Do
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   224
							line = OExec.StdOut.ReadLine()
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   225
							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
   226
								modified = 2
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   227
								Exit Do
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   228
							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
   229
						Loop While Not OExec.StdOut.atEndOfStream
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   230
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   231
						Set oExec = WshShell.Exec("hg branch")
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   232
						If Err.Number = 0 Then
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   233
							line = OExec.StdOut.ReadLine()
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   234
							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
   235
								branch = line
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   236
							End If ' line <> "default"
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   237
						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
   238
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
						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
   240
						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
   241
							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
   242
							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
   243
						End If ' Err.Number = 0
10074
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   244
					End If ' Err.Number = 0
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   245
				End If ' oExec.ExitCode = 0
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   246
			End If ' Err.Number = 0
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   247
		End If ' version = "norev000"
d6bf81ae7d87 (svn r14242) -Fix: removed some possible infinite loop in version determination (again).
glx
parents: 10035
diff changeset
   248
	End If ' version <> "norev000"
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   249
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
   250
	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
   251
		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
   252
	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
   253
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
   254
	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
   255
		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
   256
	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
   257
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
   258
	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
   259
		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
   260
	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
   261
		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
   262
	End If
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   263
End Function
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   264
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
   265
Function IsCachedVersion(ByVal version)
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   266
	Dim cache_file, cached_version
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   267
	cached_version = ""
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   268
	Set cache_file = FSO.OpenTextFile("../config.cache.version", 1, True, 0)
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   269
	If Not cache_file.atEndOfStream Then
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   270
		cached_version = cache_file.ReadLine()
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   271
	End If
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   272
	cache_file.Close
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   273
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
   274
	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
   275
		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
   276
	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
   277
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   278
	If version <> cached_version Then
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   279
		Set cache_file = fso.CreateTextFile("../config.cache.version", True)
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   280
		cache_file.WriteLine(version)
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   281
		cache_file.Close
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   282
		IsCachedVersion = False
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   283
	Else
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   284
		IsCachedVersion = True
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   285
	End If
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   286
End Function
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   287
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   288
Dim version
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   289
version = DetermineSVNVersion
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   290
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
   291
	UpdateFiles version
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
diff changeset
   292
End If