[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8d3d5d8bf1286e280d582b18bda20414f3565a7f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 16:19:09 2009 +0000

    2009-09-29  Csaba Osztrogonac  <oszi at inf.u-szeged.hu>
    
            Reviewed by David Kilzer.
    
            [Qt] Make build-webkit script work on Windows
            https://bugs.webkit.org/show_bug.cgi?id=29802
    
            * Scripts/run-webkit-tests:
            * Scripts/webkitdirs.pm:
             - Removed unnecessary -p switch for mkdir on Windows.
             - Use canonical path, which uses slashes or backslashes depends on platform.
             - isWindows() only test for Windows and not for Cyqwin.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48880 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c2472a5..de837a7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-09-29  Csaba Osztrogonac  <oszi at inf.u-szeged.hu>
+
+        Reviewed by David Kilzer.
+
+        [Qt] Make build-webkit script work on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=29802
+
+        * Scripts/run-webkit-tests:
+        * Scripts/webkitdirs.pm:
+         - Removed unnecessary -p switch for mkdir on Windows.
+         - Use canonical path, which uses slashes or backslashes depends on platform.
+         - isWindows() only test for Windows and not for Cyqwin.
+
 2009-09-29  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index f69f771..2fc4ace 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -178,7 +178,7 @@ if (isAppleMacWebKit()) {
         $platform = "qt-mac";
     } elsif (isLinux()) {
         $platform = "qt-linux";
-    } elsif (isWindows()) {
+    } elsif (isWindows() || isCygwin()) {
         $platform = "qt-win";
     } else {
         $platform = "qt";
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 6fded1a..3c7b537 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -31,6 +31,7 @@ use strict;
 use warnings;
 use FindBin;
 use File::Basename;
+use File::Spec;
 use POSIX;
 use VCSUtils;
 
@@ -865,7 +866,7 @@ sub isDarwin()
 
 sub isWindows()
 {
-    return isCygwin() || ($^O eq "MSWin32") || 0;
+    return ($^O eq "MSWin32") || 0;
 }
 
 sub isLinux()
@@ -1304,16 +1305,18 @@ sub buildQMakeProject($@)
         }
     }
 
-    my $dir = baseProductDir();
+    my $dir = File::Spec->canonpath(baseProductDir());
+    my @mkdirArgs;
+    push @mkdirArgs, "-p" if !isWindows();
     if (! -d $dir) {
-        system "mkdir", "-p", "$dir";
+        system "mkdir", @mkdirArgs, "$dir";
         if (! -d $dir) {
             die "Failed to create product directory " . $dir;
         }
     }
-    $dir = $dir . "/$config";
+    $dir = File::Spec->catfile($dir, $config);
     if (! -d $dir) {
-        system "mkdir", "-p", "$dir";
+        system "mkdir", @mkdirArgs, "$dir";
         if (! -d $dir) {
             die "Failed to create build directory " . $dir;
         }

-- 
WebKit Debian packaging