# HG changeset patch
# User glx <glx@openttd.org>
# Date 1189634753 0
# Node ID a65f68a1c928ad765b24117c868cdcfcce656ab7
# Parent  0f45d5223c87cc972ba855a17d4c664dbece52ff
(svn r11090) -Fix (r11089): incorrect version format and failure with paths containing spaces

diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -40,7 +40,7 @@
 	Dim file
 	' Write some "magic" to a temporary file so we can acquire the svn revision/state
 	Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0)
-	file.WriteLine "$WCREV$$WCMODS?M:$"
+	file.WriteLine "r$WCREV$$WCMODS?M:$"
 	file.WriteLine "$WCURL$"
 	file.Close
 	Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp")
@@ -85,7 +85,7 @@
 						url = line
 					End If
 					If InStr(line, "Last Changed Rev") Then
-						version = Mid(line, 19) & modified
+						version = "r" & Mid(line, 19) & modified
 					End If
 				Loop While Not OExec.StdOut.atEndOfStream
 			End If
diff --git a/projects/openttd.vcproj b/projects/openttd.vcproj
--- a/projects/openttd.vcproj
+++ b/projects/openttd.vcproj
@@ -75,7 +75,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"/>
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -139,7 +139,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"/>
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
diff --git a/projects/openttd.vcproj.in b/projects/openttd.vcproj.in
--- a/projects/openttd.vcproj.in
+++ b/projects/openttd.vcproj.in
@@ -75,7 +75,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"/>
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -139,7 +139,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"/>
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -34,7 +34,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -147,7 +147,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -357,7 +357,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/projects/openttd_vs80.vcproj.in b/projects/openttd_vs80.vcproj.in
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -34,7 +34,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -147,7 +147,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -357,7 +357,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
-				CommandLine="$(InputDir)/determineversion.vbs"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"