Title: [119678] trunk/Tools
- Revision
- 119678
- Author
- [email protected]
- Date
- 2012-06-06 21:26:23 -0700 (Wed, 06 Jun 2012)
Log Message
[EFL][WK2] Compile webkit1 and webkit2 by default.
https://bugs.webkit.org/show_bug.cgi?id=85041
Patch by Mariusz Grzegorczyk <[email protected]> on 2012-06-06
Reviewed by Chang Shu.
Compile webkit1 and webkit2 while running Tools/Scripts/build-webkit --efl.
Webkit2 build can be skipped by adding --no-webkit2 option to build-webkit script.
* Scripts/build-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (119677 => 119678)
--- trunk/Tools/ChangeLog 2012-06-07 04:23:35 UTC (rev 119677)
+++ trunk/Tools/ChangeLog 2012-06-07 04:26:23 UTC (rev 119678)
@@ -1,3 +1,15 @@
+2012-06-06 Mariusz Grzegorczyk <[email protected]>
+
+ [EFL][WK2] Compile webkit1 and webkit2 by default.
+ https://bugs.webkit.org/show_bug.cgi?id=85041
+
+ Reviewed by Chang Shu.
+
+ Compile webkit1 and webkit2 while running Tools/Scripts/build-webkit --efl.
+ Webkit2 build can be skipped by adding --no-webkit2 option to build-webkit script.
+
+ * Scripts/build-webkit:
+
2012-06-06 Sheriff Bot <[email protected]>
Unreviewed, rolling out r119662.
Modified: trunk/Tools/Scripts/build-webkit (119677 => 119678)
--- trunk/Tools/Scripts/build-webkit 2012-06-07 04:23:35 UTC (rev 119677)
+++ trunk/Tools/Scripts/build-webkit 2012-06-07 04:26:23 UTC (rev 119678)
@@ -324,6 +324,8 @@
if (isEfl()) {
# By default we build using all of the available CPUs.
$makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
+ $cmakeArgs .= ($cmakeArgs ? " " : "") . "-DENABLE_WEBKIT=ON";
+ $cmakeArgs .= " -DENABLE_WEBKIT2=ON" if !$noWebKit2;
buildCMakeProjectOrExit($clean, "Efl", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
