database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-27 23:21:58 +03:00
Code Activity

Fix TAP tests and MSVC scripts for pathnames with spaces.

Browse Source 
Back-patch relevant parts of commit 30b2731bd into 9.1-9.3.

Michael Paquier, Kyotaro Horiguchi

Discussion: <20160704.160213.111134711.horiguchi.kyotaro@lab.ntt.co.jp>
This commit is contained in:
Tom Lane
2016-07-11 11:24:04 -04:00
parent 76ecc20d3c
commit 71af6c006e
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/tools/msvc/Install.pm
View File

@ -268,12 +268,19 @@ sub GenerateTimezoneFiles
my $conf = shift; my $conf = shift;
my $mf = read_file("src/timezone/Makefile"); my $mf = read_file("src/timezone/Makefile");
$mf =~ s{\\\s*[\r\n]+}{}mg; $mf =~ s{\\\s*[\r\n]+}{}mg;
$mf =~ /^TZDATA\s*:?=\s*(.*)$/m || die "Could not find TZDATA row in timezone makefile\n"; $mf =~ /^TZDATA\s*:?=\s*(.*)$/m || die "Could not find TZDATA line in timezone makefile\n";
my @tzfiles = split /\s+/,$1; my @tzfiles = split /\s+/,$1;
unshift @tzfiles,'';
print "Generating timezone files..."; print "Generating timezone files...";
system( my @args = ("$conf/zic/zic",
"$conf\\zic\\zic -d \"$target/share/timezone\" " . join(" src/timezone/data/", @tzfiles)); '-d',
"$target/share/timezone");
foreach (@tzfiles)
{
my $tzfile = $_;
push(@args, "src/timezone/data/$tzfile")
}
system(@args);
print "\n"; print "\n";
} }
@ -490,8 +497,10 @@ sub CopyIncludeFiles
next unless (-d "src/include/$d"); next unless (-d "src/include/$d");
EnsureDirectories("$target/include/server/$d"); EnsureDirectories("$target/include/server/$d");
system(qq{xcopy /s /i /q /r /y src\\include\\$d\\*.h "$ctarget\\include\\server\\$d\\"}) my @args = ('xcopy', '/s', '/i', '/q', '/r', '/y',
&& croak("Failed to copy include directory $d\n"); "src\\include\\$d\\*.h",
"$ctarget\\include\\server\\$d\\");
system(@args) && croak("Failed to copy include directory $d\n");
} }
closedir($D); closedir($D);
@ -545,9 +554,11 @@ sub GenerateNLSFiles
$lang = $1; $lang = $1;
EnsureDirectories($target, "share/locale/$lang", "share/locale/$lang/LC_MESSAGES"); EnsureDirectories($target, "share/locale/$lang", "share/locale/$lang/LC_MESSAGES");
system( my @args = ("$nlspath\\bin\\msgfmt",
"\"$nlspath\\bin\\msgfmt\" -o \"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo\" $_" '-o',
)&& croak("Could not run msgfmt on $dir\\$_"); "$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
$_);
system(@args) && croak("Could not run msgfmt on $dir\\$_");
print "."; print ".";
} }
} }