Quote the WEBKITLIBRARIESDIR path before passing it to the shell/cygpath

Fixes <http://webkit.org/b/68621> build-webkit goes totally haywire on Windows if there are
spaces in the path to the WebKit source tree

Reviewed by John Sullivan.

* Scripts/webkitdirs.pm:
(setupCygwinEnv):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95731 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f23a79c..e2c9c72 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-22  Adam Roben  <aroben@apple.com>
+
+        Quote the WEBKITLIBRARIESDIR path before passing it to the shell/cygpath
+
+        Fixes <http://webkit.org/b/68621> build-webkit goes totally haywire on Windows if there are
+        spaces in the path to the WebKit source tree
+
+        Reviewed by John Sullivan.
+
+        * Scripts/webkitdirs.pm:
+        (setupCygwinEnv):
+
 2011-09-22  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Use same DPI for application font as rest of app in DRT and WTR

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 5f3b1a0..410f58b 100644 (file)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1248,7 +1248,7 @@ sub setupCygwinEnv()
     
     unless ($ENV{WEBKITLIBRARIESDIR}) {
         $ENV{'WEBKITLIBRARIESDIR'} = File::Spec->catdir($sourceDir, "WebKitLibraries", "win");
-        chomp($ENV{WEBKITLIBRARIESDIR} = `cygpath -wa $ENV{WEBKITLIBRARIESDIR}`) if isCygwin();
+        chomp($ENV{WEBKITLIBRARIESDIR} = `cygpath -wa '$ENV{WEBKITLIBRARIESDIR}'`) if isCygwin();
     }
 
     print "Building results into: ", baseProductDir(), "\n";