git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb3051e)
Avoid use of mixed slash style paths in arguments to xcopy in MSVC builds.
Fri, 8 Apr 2011 02:16:56 +0000 (22:16 -0400)
Fri, 8 Apr 2011 02:16:56 +0000 (22:16 -0400)
Some versions of xcopy, notably on Windows 7 don't like it. Backpatch
to 8.3, where we first used xcopy.


diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index d367bae1bf017f93d8e9c60ac62651e89676d05c..ead866291f8ace541511a36e794a799b687e1b29 100644 (file)
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -437,15 +437,17 @@ sub CopyIncludeFiles
my $D;
opendir($D, 'src/include') || croak "Could not opendir on src/include!\n";
+ # some xcopy progs don't like mixed slash style paths
+ (my $ctarget = $target) =~ s!/!\\!g;
while (my $d = readdir($D))
{
next if ($d =~ /^\./);
next if ($d eq '.git');
next if ($d eq 'CVS');
- next unless (-d 'src/include/' . $d);
+ next unless (-d "src/include/$d");
- EnsureDirectories($target . '/include/server', $d);
- system("xcopy /s /i /q /r /y src\\include\\$d\\*.h \"$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\\"})
&& croak("Failed to copy include directory $d\n");
}
closedir($D);
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /