Mercurial Mercurial > openttd-mini / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r11090) -Fix (r11089): incorrect version format and failure with paths containing spaces
authorglx
Wed, 12 Sep 2007 22:05:53 +0000
changeset 7565 a7ce188ec44e
parent 7564 fa54ab680589
child 7566 a8dd64b03224
(svn r11090) -Fix (r11089): incorrect version format and failure with paths containing spaces
projects/determineversion.vbs file | annotate | diff | comparison | revisions
projects/openttd.vcproj file | annotate | diff | comparison | revisions
projects/openttd.vcproj.in file | annotate | diff | comparison | revisions
projects/openttd_vs80.vcproj file | annotate | diff | comparison | revisions
projects/openttd_vs80.vcproj.in file | annotate | diff | comparison | revisions 
--- a/projects/determineversion.vbs	Wed Sep 12 07:11:48 2007 +0000
+++ b/projects/determineversion.vbs	Wed Sep 12 22:05:53 2007 +0000
@@ -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
--- a/projects/openttd.vcproj	Wed Sep 12 07:11:48 2007 +0000
+++ b/projects/openttd.vcproj	Wed Sep 12 22:05:53 2007 +0000
@@ -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
--- a/projects/openttd.vcproj.in	Wed Sep 12 07:11:48 2007 +0000
+++ b/projects/openttd.vcproj.in	Wed Sep 12 22:05:53 2007 +0000
@@ -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
--- a/projects/openttd_vs80.vcproj	Wed Sep 12 07:11:48 2007 +0000
+++ b/projects/openttd_vs80.vcproj	Wed Sep 12 22:05:53 2007 +0000
@@ -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"
--- a/projects/openttd_vs80.vcproj.in	Wed Sep 12 07:11:48 2007 +0000
+++ b/projects/openttd_vs80.vcproj.in	Wed Sep 12 22:05:53 2007 +0000
@@ -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"
openttd-mini