Changeset 48880 in webkit

Timestamp:

Sep 29, 2009 9:19:09 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-09-29 Csaba Osztrogonac <​oszi@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.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-webkit-tests (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-09-29  Csaba Osztrogonac  <oszi@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@stud.u-szeged.hu>
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -179 +179 @@
     } elsif (isLinux()) {
         $platform = "qt-linux";
-    } elsif (isWindows()) {
+    } elsif (isWindows() || isCygwin()) {
         $platform = "qt-win";
     } else {

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -32 +32 @@
 use FindBin;
 use File::Basename;
+use File::Spec;
 use POSIX;
 use VCSUtils;
@@ -866 +867 @@
 sub isWindows()
 {
-    return isCygwin() || ($^O eq "MSWin32") || 0;
+    return ($^O eq "MSWin32") || 0;
 }
 
@@ -1305 +1306 @@
     }
 
-    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;