Restored ENABLE_WEBCORE option and used it in JSCOnly port.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Mar 2016 15:42:54 +0000 (15:42 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Mar 2016 15:42:54 +0000 (15:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=155428

Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-03-14
Reviewed by Michael Catanzaro.

This is a partial revert of r182624.

* CMakeLists.txt:
* Source/CMakeLists.txt:
* Source/cmake/OptionsJSCOnly.cmake:
* Source/cmake/WebKitFS.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198132 268f45cc-cd09-0410-ab3c-d52691b4dbfc

CMakeLists.txt
ChangeLog
Source/CMakeLists.txt
Source/cmake/OptionsJSCOnly.cmake
Source/cmake/WebKitFS.cmake

index abc01f5..385bd5f 100644 (file)
@@ -8,6 +8,8 @@ endif ()
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
+set(ENABLE_WEBCORE ON)
+
 if (NOT DEFINED ENABLE_WEBKIT)
     set(ENABLE_WEBKIT ON)
 endif ()
index 1b0fe1a..02e6895 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2016-03-14  Konstantin Tokarev  <annulen@yandex.ru>
+
+        Restored ENABLE_WEBCORE option and used it in JSCOnly port.
+        https://bugs.webkit.org/show_bug.cgi?id=155428
+
+        Reviewed by Michael Catanzaro.
+
+        This is a partial revert of r182624.
+
+        * CMakeLists.txt:
+        * Source/CMakeLists.txt:
+        * Source/cmake/OptionsJSCOnly.cmake:
+        * Source/cmake/WebKitFS.cmake:
+
 2016-03-13  Joseph Pecoraro  <pecoraro@apple.com>
 
         Remove ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) guards
index 719c621..f48aad6 100644 (file)
@@ -9,8 +9,6 @@ add_subdirectory(WTF)
 
 add_subdirectory(JavaScriptCore)
 
-add_subdirectory(WebCore)
-
 if (WIN32 AND ENABLE_GRAPHICS_CONTEXT_3D)
     add_subdirectory(ThirdParty/ANGLE)
 endif ()
@@ -24,6 +22,10 @@ if (USE_WOFF2)
     add_subdirectory(ThirdParty/woff2)
 endif ()
 
+if (ENABLE_WEBCORE)
+    add_subdirectory(WebCore)
+endif ()
+
 if (ENABLE_WEBKIT)
     add_subdirectory(WebKit)
 endif ()
@@ -42,8 +44,11 @@ if (NOT USE_SYSTEM_MALLOC)
 endif ()
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WTF ${ADDITIONAL_COMPILER_FLAGS})
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(JavaScriptCore ${ADDITIONAL_COMPILER_FLAGS})
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreTestSupport ${ADDITIONAL_COMPILER_FLAGS})
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCore ${ADDITIONAL_COMPILER_FLAGS})
+
+if (ENABLE_WEBCORE)
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreTestSupport ${ADDITIONAL_COMPILER_FLAGS})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCore ${ADDITIONAL_COMPILER_FLAGS})
+endif ()
 
 if (ENABLE_WEBKIT)
     WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_COMPILER_FLAGS})
index 281db25..1e4a721 100644 (file)
@@ -25,6 +25,7 @@ endif ()
 
 set(EVENTLOOP_TYPE ${DEFAULT_EVENTLOOP_TYPE} CACHE STRING "Implementation of event loop to be used in JavaScriptCore (one of ${ALL_EVENTLOOP_TYPES})")
 
+set(ENABLE_WEBCORE OFF)
 set(ENABLE_WEBKIT OFF)
 set(ENABLE_WEBKIT2 OFF)
 set(ENABLE_API_TESTS OFF)
index 41d94dc..29a0969 100644 (file)
@@ -34,11 +34,14 @@ set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebIn
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
 
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/Protocol)
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
 
+if (ENABLE_WEBCORE)
+    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
+endif ()
+
 if (ENABLE_WEBKIT2)
     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
 endif ()