summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-09-12 22:05:53 +0000
committerglx <glx@openttd.org>2007-09-12 22:05:53 +0000
commitf2dc723da5db03840783b5f00103f2346e64128d (patch)
treec32bc31372e2cf937961aef19a94a416e49380fd /projects
parent9e7931f6ea41eea7052e7f40cc841694feed252b (diff)
downloadopenttd-f2dc723da5db03840783b5f00103f2346e64128d.tar.xz
(svn r11090) -Fix (r11089): incorrect version format and failure with paths containing spaces
Diffstat (limited to 'projects')
-rw-r--r--projects/determineversion.vbs4
-rw-r--r--projects/openttd.vcproj4
-rw-r--r--projects/openttd.vcproj.in4
-rw-r--r--projects/openttd_vs80.vcproj8
-rw-r--r--projects/openttd_vs80.vcproj.in8
5 files changed, 14 insertions, 14 deletions
diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs
index fc1c31405..6d04e49f2 100644
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -40,7 +40,7 @@ Function DetermineSVNVersion()
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 @@ Function DetermineSVNVersion()
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
index fae3678b5..6500d1d9f 100644
--- 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
index bf58713a0..afdac3331 100644
--- 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
index e2a5414ba..2d3e49bc7 100644
--- 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
index de8feb428..d62c02d3f 100644
--- 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"