Fix build for directories with spaces in them by quoting properly.

mhagander · mhagander · commit ac7e6c0665a3 · 2007-04-21T20:58:05.000Z
Joachim Wieland
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
@@ -3,7 +3,7 @@ package Install;
 #
 # Package that provides 'make install' functionality for msvc builds
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.10 2007/04/12 12:46:20 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.11 2007/04/21 20:58:05 mha Exp $
 #
 use strict;
 use warnings;
@@ -210,7 +210,7 @@ sub GenerateTimezoneFiles
     my @tzfiles = split /\s+/,$1;
     unshift @tzfiles,'';
     print "Generating timezone files...";
-    system("$conf\\zic\\zic -d $target/share/timezone " . join(" src/timezone/data/", @tzfiles));
+    system("$conf\\zic\\zic -d \"$target/share/timezone\" " . join(" src/timezone/data/", @tzfiles));
     print "\n";
 }
 
diff --git a/src/tools/msvc/vcregress.bat b/src/tools/msvc/vcregress.bat
@@ -1,5 +1,5 @@
 @echo off
-REM $PostgreSQL: pgsql/src/tools/msvc/vcregress.bat,v 1.10 2007/04/06 13:44:39 adunstan Exp $
+REM $PostgreSQL: pgsql/src/tools/msvc/vcregress.bat,v 1.11 2007/04/21 20:58:05 mha Exp $
 
 SETLOCAL
 SET STARTDIR=%CD%
@@ -30,13 +30,13 @@ IF NOT "%2"=="" SET SCHEDULE=%2
 
 SET PERL5LIB=..\..\tools\msvc
 
-if "%what%"=="INSTALLCHECK" ..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir=..\..\..\%CONFIG%\psql --schedule=%SCHEDULE%_schedule --multibyte=SQL_ASCII --load-language=plpgsql --no-locale
-if "%what%"=="CHECK" ..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir=..\..\..\%CONFIG%\psql --schedule=%SCHEDULE%_schedule --multibyte=SQL_ASCII --load-language=plpgsql --no-locale --temp-install=./tmp_check --top-builddir=%TOPDIR% --temp-port=%TEMPPORT%
+if "%what%"=="INSTALLCHECK" ..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir="..\..\..\%CONFIG%\psql" --schedule=%SCHEDULE%_schedule --multibyte=SQL_ASCII --load-language=plpgsql --no-locale
+if "%what%"=="CHECK" ..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir="..\..\..\%CONFIG%\psql" --schedule=%SCHEDULE%_schedule --multibyte=SQL_ASCII --load-language=plpgsql --no-locale --temp-install=./tmp_check --top-builddir="%TOPDIR%" --temp-port=%TEMPPORT%
 if "%what%"=="PLCHECK" call :plcheck
 if "%what%"=="CONTRIBCHECK" call :contribcheck
 SET E=%ERRORLEVEL%
 
-cd %STARTDIR%
+cd "%STARTDIR%"
 exit /b %E%
 
 :usage

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Install;`
`3`	`3`	`#`
`4`	`4`	`# Package that provides 'make install' functionality for msvc builds`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.10 2007/04/12 12:46:20 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.11 2007/04/21 20:58:05 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use strict;`
`9`	`9`	`use warnings;`
`@@ -210,7 +210,7 @@ sub GenerateTimezoneFiles`
`210`	`210`	`my @tzfiles = split /\s+/,$1;`
`211`	`211`	`unshift @tzfiles,'';`
`212`	`212`	`print "Generating timezone files...";`
`213`		`- system("$conf\\zic\\zic -d $target/share/timezone " . join(" src/timezone/data/", @tzfiles));`
	`213`	`+ system("$conf\\zic\\zic -d \"$target/share/timezone\" " . join(" src/timezone/data/", @tzfiles));`
`214`	`214`	`print "\n";`
`215`	`215`	`}`
`216`	`216`