mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-06 06:15:04 +00:00
(svn r11090) -Fix (r11089): incorrect version format and failure with paths containing spaces
This commit is contained in:
parent
9e7931f6ea
commit
f2dc723da5
@ -40,7 +40,7 @@ Function DetermineSVNVersion()
|
|||||||
Dim file
|
Dim file
|
||||||
' Write some "magic" to a temporary file so we can acquire the svn revision/state
|
' Write some "magic" to a temporary file so we can acquire the svn revision/state
|
||||||
Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0)
|
Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0)
|
||||||
file.WriteLine "$WCREV$$WCMODS?M:$"
|
file.WriteLine "r$WCREV$$WCMODS?M:$"
|
||||||
file.WriteLine "$WCURL$"
|
file.WriteLine "$WCURL$"
|
||||||
file.Close
|
file.Close
|
||||||
Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp")
|
Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp")
|
||||||
@ -85,7 +85,7 @@ Function DetermineSVNVersion()
|
|||||||
url = line
|
url = line
|
||||||
End If
|
End If
|
||||||
If InStr(line, "Last Changed Rev") Then
|
If InStr(line, "Last Changed Rev") Then
|
||||||
version = Mid(line, 19) & modified
|
version = "r" & Mid(line, 19) & modified
|
||||||
End If
|
End If
|
||||||
Loop While Not OExec.StdOut.atEndOfStream
|
Loop While Not OExec.StdOut.atEndOfStream
|
||||||
End If
|
End If
|
||||||
|
@ -75,7 +75,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"/>
|
CommandLine=""$(InputDir)/determineversion.vbs""/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"/>
|
Name="VCPreLinkEventTool"/>
|
||||||
<Tool
|
<Tool
|
||||||
@ -139,7 +139,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"/>
|
CommandLine=""$(InputDir)/determineversion.vbs""/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"/>
|
Name="VCPreLinkEventTool"/>
|
||||||
<Tool
|
<Tool
|
||||||
|
@ -75,7 +75,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"/>
|
CommandLine=""$(InputDir)/determineversion.vbs""/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"/>
|
Name="VCPreLinkEventTool"/>
|
||||||
<Tool
|
<Tool
|
||||||
@ -139,7 +139,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"/>
|
CommandLine=""$(InputDir)/determineversion.vbs""/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"/>
|
Name="VCPreLinkEventTool"/>
|
||||||
<Tool
|
<Tool
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"
|
CommandLine=""$(InputDir)/determineversion.vbs""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
@ -147,7 +147,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"
|
CommandLine=""$(InputDir)/determineversion.vbs""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
@ -260,7 +260,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"
|
CommandLine=""$(InputDir)/determineversion.vbs""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
@ -357,7 +357,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"
|
CommandLine=""$(InputDir)/determineversion.vbs""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"
|
CommandLine=""$(InputDir)/determineversion.vbs""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
@ -147,7 +147,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"
|
CommandLine=""$(InputDir)/determineversion.vbs""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
@ -260,7 +260,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"
|
CommandLine=""$(InputDir)/determineversion.vbs""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
@ -357,7 +357,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
Description="Determining version number"
|
Description="Determining version number"
|
||||||
CommandLine="$(InputDir)/determineversion.vbs"
|
CommandLine=""$(InputDir)/determineversion.vbs""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
|
Loading…
Reference in New Issue
Block a user