Changeset 96207 in webkit

Timestamp:

Sep 28, 2011 2:27:35 AM (13 years ago)

Author:

Philippe Normand

Message:

[GTK] build-webkit --no-webkit2 still builds WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=68892

Reviewed by Martin Robinson.

Take the --no-webkit2 option in account when building WebKitGTK+.

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

(buildAutotoolsProject):
(buildGtkProject):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-27  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] build-webkit --no-webkit2 still builds WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=68892
+
+        Reviewed by Martin Robinson.
+
+        Take the --no-webkit2 option in account when building WebKitGTK+.
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+        (buildAutotoolsProject):
+        (buildGtkProject):
+
 2011-09-28  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/build-webkit

@@ -594 +594 @@
     my $project = basename($dir);
     if (isGtk()) {
-        $result = buildGtkProject($project, $clean,  @options);
+        $result = buildGtkProject($project, $clean, !$noWebKit2, @options);
     } elsif (isQt()) {
         #FIXME: $dir should probably be $project.

trunk/Tools/Scripts/webkitdirs.pm

@@ -1497 +1497 @@
 sub buildAutotoolsProject($@)
 {
-    my ($project, $clean, @buildParams) = @_;
+    my ($project, $clean, $enableWebKit2, @buildParams) = @_;
 
     my $make = 'make';
@@ -1530 +1530 @@
     # This is a temporary work-around to enable building WebKit2 on the bots,
     # but ensuring that it does not ship until the API is stable.
-    if ($project eq "WebKit" and isGtk()) {
+    if ($project eq "WebKit" and isGtk() and $enableWebKit2) {
         push @buildArgs, "--enable-webkit2";
     }
@@ -1868 +1868 @@
 sub buildGtkProject
 {
-    my ($project, $clean, @buildArgs) = @_;
+    my ($project, $clean, $enableWebKit2, @buildArgs) = @_;
 
     if ($project ne "WebKit" and $project ne "JavaScriptCore") {
@@ -1874 +1874 @@
     }
 
-    return buildAutotoolsProject($project, $clean, @buildArgs);
+    return buildAutotoolsProject($project, $clean, $enableWebKit2, @buildArgs);
 }