Title: [136398] trunk
- Revision
- 136398
- Author
- commit-qu...@webkit.org
- Date
- 2012-12-03 07:20:51 -0800 (Mon, 03 Dec 2012)
Log Message
[CMake] Enable building WebKit2-only build for the EFL port
https://bugs.webkit.org/show_bug.cgi?id=103820
Patch by Laszlo Gombos <l.gom...@samsung.com> on 2012-12-03
Reviewed by Gyuyoung Kim.
.:
To create a WebKit2-only build for EFL use the following command:
build-webkit --efl --cmakeargs="-DENABLE_WEBKIT=OFF".
* CMakeLists.txt: Turn on WebKit1 support if it is not explicitly set (enabled or disabled) for
all CMake based ports.
* Source/cmake/OptionsEfl.cmake: Enable WebKit2
for the EFL port if it is not explicitly set (enabled or disabled).
Tools:
Set ENABLE_WEBKIT2 to OFF if build-webkit was run with --no-webkit2.
Never set ENABLE_WEBKIT in build-webkit. This will simplyfy invoking
cmake directly. Initialize $cmakeArgs to avoid potential
warnings when running the script.
* Scripts/build-webkit:
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (136397 => 136398)
--- trunk/CMakeLists.txt 2012-12-03 15:18:05 UTC (rev 136397)
+++ trunk/CMakeLists.txt 2012-12-03 15:20:51 UTC (rev 136398)
@@ -13,7 +13,7 @@
# -----------------------------------------------------------------------------
SET(ENABLE_WEBCORE ON)
-IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
+IF (NOT DEFINED ENABLE_WEBKIT)
SET(ENABLE_WEBKIT ON)
ENDIF ()
Modified: trunk/ChangeLog (136397 => 136398)
--- trunk/ChangeLog 2012-12-03 15:18:05 UTC (rev 136397)
+++ trunk/ChangeLog 2012-12-03 15:20:51 UTC (rev 136398)
@@ -1,3 +1,19 @@
+2012-12-03 Laszlo Gombos <l.gom...@samsung.com>
+
+ [CMake] Enable building WebKit2-only build for the EFL port
+ https://bugs.webkit.org/show_bug.cgi?id=103820
+
+ Reviewed by Gyuyoung Kim.
+
+ To create a WebKit2-only build for EFL use the following command:
+ build-webkit --efl --cmakeargs="-DENABLE_WEBKIT=OFF".
+
+ * CMakeLists.txt: Turn on WebKit1 support if it is not explicitly set (enabled or disabled) for
+ all CMake based ports.
+
+ * Source/cmake/OptionsEfl.cmake: Enable WebKit2
+ for the EFL port if it is not explicitly set (enabled or disabled).
+
2012-12-03 Zeno Albisser <z...@webkit.org>
[Qt][Mac] QtWebKitWidgets has wrong install_name.
Modified: trunk/Source/cmake/OptionsEfl.cmake (136397 => 136398)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-12-03 15:18:05 UTC (rev 136397)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-12-03 15:20:51 UTC (rev 136398)
@@ -5,6 +5,10 @@
ADD_DEFINITIONS(-DBUILDING_EFL__=1)
+IF (NOT DEFINED ENABLE_WEBKIT2)
+ SET(ENABLE_WEBKIT2 ON)
+ENDIF ()
+
FIND_PACKAGE(Cairo 1.10.2 REQUIRED)
FIND_PACKAGE(Fontconfig 2.8.0 REQUIRED)
FIND_PACKAGE(Sqlite REQUIRED)
Modified: trunk/Tools/ChangeLog (136397 => 136398)
--- trunk/Tools/ChangeLog 2012-12-03 15:18:05 UTC (rev 136397)
+++ trunk/Tools/ChangeLog 2012-12-03 15:20:51 UTC (rev 136398)
@@ -1,3 +1,17 @@
+2012-12-03 Laszlo Gombos <l.gom...@samsung.com>
+
+ [CMake] Enable building WebKit2-only build for the EFL port
+ https://bugs.webkit.org/show_bug.cgi?id=103820
+
+ Reviewed by Gyuyoung Kim.
+
+ Set ENABLE_WEBKIT2 to OFF if build-webkit was run with --no-webkit2.
+ Never set ENABLE_WEBKIT in build-webkit. This will simplyfy invoking
+ cmake directly. Initialize $cmakeArgs to avoid potential
+ warnings when running the script.
+
+ * Scripts/build-webkit:
+
2012-12-03 Tommy Widenflycht <tom...@google.com>
Speech Recognition API: Update SpeechRecognitionEvent to match the specification
Modified: trunk/Tools/Scripts/build-webkit (136397 => 136398)
--- trunk/Tools/Scripts/build-webkit 2012-12-03 15:18:05 UTC (rev 136397)
+++ trunk/Tools/Scripts/build-webkit 2012-12-03 15:20:51 UTC (rev 136398)
@@ -57,7 +57,7 @@
my $installLibs;
my $prefixPath;
my $makeArgs = "";
-my $cmakeArgs;
+my $cmakeArgs = "";
my $_onlyWebKitProject_ = 0;
my $noWebKit2 = 0;
my $coverageSupport = 0;
@@ -319,8 +319,7 @@
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;
+ $cmakeArgs = "-DENABLE_WEBKIT2=OFF " . $cmakeArgs if $noWebKit2;
# We remove CMakeCache to avoid the bots to reuse cached flags when
# we enable new features. This forces a reconfiguration.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
