Changeset 79846 in webkit

Timestamp:

Feb 28, 2011 2:04:21 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-28 Kristian Amlie <​kristian.amlie@nokia.com>

Reviewed by Andreas Kling.

Made sure that the build-webkit --qmake argument is always respected.

Previously, it would be respected during the build, but not during
the early feature detection. The build would also fail if qmake was
not in your path, even if you specified --qmake with a valid qmake
binary.

[Qt] WebKit patches required to work with a modularized version of Qt
​https://bugs.webkit.org/show_bug.cgi?id=53916

• Scripts/build-webkit:
• Scripts/webkitdirs.pm:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-02-28  Kristian Amlie  <kristian.amlie@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Made sure that the build-webkit --qmake argument is always respected.
+
+        Previously, it would be respected during the build, but not during
+        the early feature detection. The build would also fail if qmake was
+        not in your path, even if you specified --qmake with a valid qmake
+        binary.
+
+        [Qt] WebKit patches required to work with a modularized version of Qt
+        https://bugs.webkit.org/show_bug.cgi?id=53916
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+
 2011-02-27  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/Scripts/build-webkit

@@ -287 +287 @@
 # Update defaults from Qt's project file
 if (isQt()) {
+    # Take a sneek peek at the arguments, since we will need the qmake binary early
+    # on to do profile parsing.
+    foreach (@ARGV) {
+        if (/^--qmake=(.*)/) {
+            setQmakeBinaryPath($1);
+        }
+    }
     my %qtDefaults = qtFeatureDefaults();
     foreach (@features) {

trunk/Tools/Scripts/webkitdirs.pm

@@ -61 +61 @@
 my $osXVersion;
 my $isQt;
+my $qmakebin = "qmake"; # Allow override of the qmake binary from $PATH
 my $isSymbian;
 my %qtFeatureDefaults;
@@ -106 +107 @@
     }
     return $thisPerl;
+}
+
+sub setQmakeBinaryPath($)
+{
+    ($qmakebin) = @_;
 }
 
@@ -589 +595 @@
             }
 
-            my $mkspec = `qmake -query QMAKE_MKSPECS`;
+            my $mkspec = `$qmakebin -query QMAKE_MKSPECS`;
             $mkspec =~ s/[\n|\r]$//g;
             my $qtMajorVersion = retrieveQMakespecVar("$mkspec/qconfig.pri", "QT_MAJOR_VERSION");
@@ -683 +689 @@
 {
     return if %qtFeatureDefaults;
-    die "ERROR: qmake missing but required to build WebKit.\n" if not commandExists("qmake");
+    die "ERROR: qmake missing but required to build WebKit.\n" if not commandExists($qmakebin);
     my $originalCwd = getcwd();
     chdir File::Spec->catfile(sourceDir(), "Source", "WebCore");
-    my $defaults = `qmake CONFIG+=compute_defaults 2>&1`;
+    my $defaults = `$qmakebin CONFIG+=compute_defaults 2>&1`;
     chdir $originalCwd;
 
@@ -1563 +1569 @@
     my @buildArgs = ("-r");
 
-    my $qmakebin = "qmake"; # Allow override of the qmake binary from $PATH
     my $makeargs = "";
     my $installHeaders;
@@ -1837 +1842 @@
         $env->{PATH} = join(':', productDir(), dirname(installedSafariPath()), appleApplicationSupportPath(), $env->{PATH} || "");
     } elsif (isQt()) {
-        my $qtLibs = `qmake -query QT_INSTALL_LIBS`;
+        my $qtLibs = `$qmakebin -query QT_INSTALL_LIBS`;
         $qtLibs =~ s/[\n|\r]$//g;
         $env->{PATH} = join(';', $qtLibs, productDir() . "/lib", $env->{PATH} || "");