Fix TAP tests and MSVC scripts for pathnames with spaces.

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>

1 files changed, 20 insertions, 9 deletions

diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index b779b313960..bbb5c39e16e 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -268,12 +268,19 @@ sub GenerateTimezoneFiles
     my $conf = shift;
     my $mf = read_file("src/timezone/Makefile");
     $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;
-    unshift @tzfiles,'';
     print "Generating timezone files...";
-    system(
-        "$conf\\zic\\zic -d \"$target/share/timezone\" " . join(" src/timezone/data/", @tzfiles));
+    my @args = ("$conf/zic/zic",
+                '-d',
+                "$target/share/timezone");
+    foreach (@tzfiles)
+    {
+        my $tzfile = $_;
+        push(@args, "src/timezone/data/$tzfile")
+    }
+
+    system(@args);
     print "\n";
 }
 
@@ -490,8 +497,10 @@ sub CopyIncludeFiles
         next unless (-d "src/include/$d");
 
         EnsureDirectories("$target/include/server/$d");
-        system(qq{xcopy /s /i /q /r /y src\\include\\$d\\*.h "$ctarget\\include\\server\\$d\\"})
-          && croak("Failed to copy include directory $d\n");
+        my @args = ('xcopy', '/s', '/i', '/q', '/r', '/y',
+                    "src\\include\\$d\\*.h",
+                    "$ctarget\\include\\server\\$d\\");
+        system(@args) && croak("Failed to copy include directory $d\n");
     }
     closedir($D);
 
@@ -545,9 +554,11 @@ sub GenerateNLSFiles
             $lang = $1;
 
             EnsureDirectories($target, "share/locale/$lang", "share/locale/$lang/LC_MESSAGES");
-            system(
-"\"$nlspath\\bin\\msgfmt\" -o \"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo\" $_"
-            )&& croak("Could not run msgfmt on $dir\\$_");
+            my @args = ("$nlspath\\bin\\msgfmt",
+                        '-o',
+                        "$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
+                        $_);
+            system(@args) && croak("Could not run msgfmt on $dir\\$_");
             print ".";
         }
     }