Title: [96207] trunk/Tools
- Revision
- 96207
- Author
- [email protected]
- Date
- 2011-09-28 02:27:35 -0700 (Wed, 28 Sep 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (96206 => 96207)
--- trunk/Tools/ChangeLog 2011-09-28 08:47:08 UTC (rev 96206)
+++ trunk/Tools/ChangeLog 2011-09-28 09:27:35 UTC (rev 96207)
@@ -1,3 +1,17 @@
+2011-09-27 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
Make Chromium Win Release (Tests) a core builder
Modified: trunk/Tools/Scripts/build-webkit (96206 => 96207)
--- trunk/Tools/Scripts/build-webkit 2011-09-28 08:47:08 UTC (rev 96206)
+++ trunk/Tools/Scripts/build-webkit 2011-09-28 09:27:35 UTC (rev 96207)
@@ -593,7 +593,7 @@
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.
$result = buildQMakeQtProject($dir, $clean, @options);
Modified: trunk/Tools/Scripts/webkitdirs.pm (96206 => 96207)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-09-28 08:47:08 UTC (rev 96206)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-09-28 09:27:35 UTC (rev 96207)
@@ -1496,7 +1496,7 @@
sub buildAutotoolsProject($@)
{
- my ($project, $clean, @buildParams) = @_;
+ my ($project, $clean, $enableWebKit2, @buildParams) = @_;
my $make = 'make';
my $dir = productDir();
@@ -1529,7 +1529,7 @@
# 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";
}
@@ -1867,13 +1867,13 @@
sub buildGtkProject
{
- my ($project, $clean, @buildArgs) = @_;
+ my ($project, $clean, $enableWebKit2, @buildArgs) = @_;
if ($project ne "WebKit" and $project ne "_javascript_Core") {
die "Unsupported project: $project. Supported projects: WebKit, _javascript_Core\n";
}
- return buildAutotoolsProject($project, $clean, @buildArgs);
+ return buildAutotoolsProject($project, $clean, $enableWebKit2, @buildArgs);
}
sub buildChromiumMakefile($$@)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
