From ac7e6c0665a377fb0e4e5b12cfc762c1b14e425e Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Sat, 21 Apr 2007 20:58:05 +0000
Subject: [PATCH] Fix build for directories with spaces in them by quoting
properly.
Joachim Wieland
---
src/tools/msvc/Install.pm | 4 ++--
src/tools/msvc/vcregress.bat | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index e945a7f5c4a..c1310380807 100644
--- 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
index 6bb115023e3..87939899675 100644
--- 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
--
GitLab