Mercurial > hg > openttd
changeset 7565:a65f68a1c928 draft
(svn r11090) -Fix (r11089): incorrect version format and failure with paths containing spaces
| author | glx <glx@openttd.org> |
|---|---|
| date | Wed, 12 Sep 2007 22:05:53 +0000 |
| parents | 0f45d5223c87 |
| children | 9da968584674 |
| files | projects/determineversion.vbs projects/openttd.vcproj projects/openttd.vcproj.in projects/openttd_vs80.vcproj projects/openttd_vs80.vcproj.in |
| diffstat | 5 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/projects/openttd.vcproj +++ b/projects/openttd.vcproj @@ -75,7 +75,7 @@ <Tool Name="VCPreBuildEventTool" Description="Determining version number" - CommandLine="$(InputDir)/determineversion.vbs"/> + CommandLine=""$(InputDir)/determineversion.vbs""/> <Tool Name="VCPreLinkEventTool"/> <Tool @@ -139,7 +139,7 @@ <Tool Name="VCPreBuildEventTool" Description="Determining version number" - CommandLine="$(InputDir)/determineversion.vbs"/> + CommandLine=""$(InputDir)/determineversion.vbs""/> <Tool Name="VCPreLinkEventTool"/> <Tool
--- 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=""$(InputDir)/determineversion.vbs""/> <Tool Name="VCPreLinkEventTool"/> <Tool @@ -139,7 +139,7 @@ <Tool Name="VCPreBuildEventTool" Description="Determining version number" - CommandLine="$(InputDir)/determineversion.vbs"/> + CommandLine=""$(InputDir)/determineversion.vbs""/> <Tool Name="VCPreLinkEventTool"/> <Tool
--- 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=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -147,7 +147,7 @@ <Tool Name="VCPreBuildEventTool" Description="Determining version number" - CommandLine="$(InputDir)/determineversion.vbs" + CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -260,7 +260,7 @@ <Tool Name="VCPreBuildEventTool" Description="Determining version number" - CommandLine="$(InputDir)/determineversion.vbs" + CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -357,7 +357,7 @@ <Tool Name="VCPreBuildEventTool" Description="Determining version number" - CommandLine="$(InputDir)/determineversion.vbs" + CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool"
--- 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=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -147,7 +147,7 @@ <Tool Name="VCPreBuildEventTool" Description="Determining version number" - CommandLine="$(InputDir)/determineversion.vbs" + CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -260,7 +260,7 @@ <Tool Name="VCPreBuildEventTool" Description="Determining version number" - CommandLine="$(InputDir)/determineversion.vbs" + CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -357,7 +357,7 @@ <Tool Name="VCPreBuildEventTool" Description="Determining version number" - CommandLine="$(InputDir)/determineversion.vbs" + CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool"