Diff
Modified: trunk/ChangeLog (199256 => 199257)
--- trunk/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
@@ -1,3 +1,14 @@
+2016-04-08 Alex Christensen <[email protected]>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * Source/cmake/OptionsMac.cmake:
+ FTL works on Mac, so let's use it.
+ * Source/cmake/WebKitMacros.cmake:
+
2016-04-07 Joseph Pecoraro <[email protected]>
Remove ENABLE(ENABLE_ES6_CLASS_SYNTAX) guards
Modified: trunk/Source/_javascript_Core/ChangeLog (199256 => 199257)
--- trunk/Source/_javascript_Core/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
@@ -1,3 +1,12 @@
+2016-04-08 Alex Christensen <[email protected]>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * PlatformMac.cmake:
+
2016-04-08 Saam barati <[email protected]>
Debugger may dereference m_currentCallFrame even after the VM has gone idle
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (199256 => 199257)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -39,6 +39,8 @@
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
)
+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
+
# FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h)
file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")
Modified: trunk/Source/WTF/ChangeLog (199256 => 199257)
--- trunk/Source/WTF/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WTF/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
@@ -1,3 +1,12 @@
+2016-04-08 Alex Christensen <[email protected]>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * wtf/PlatformMac.cmake:
+
2016-04-08 Yusuke Suzuki <[email protected]>
[JSC] Enable Concurrent JIT by default
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (199256 => 199257)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -1,4 +1,4 @@
-set(WTF_LIBRARY_TYPE SHARED)
+set(WTF_LIBRARY_TYPE STATIC)
find_library(COCOA_LIBRARY Cocoa)
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
Modified: trunk/Source/WebCore/CMakeLists.txt (199256 => 199257)
--- trunk/Source/WebCore/CMakeLists.txt 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-04-09 00:36:06 UTC (rev 199257)
@@ -2969,7 +2969,6 @@
set(WebCore_LIBRARIES
${ICU_LIBRARIES}
_javascript_Core${DEBUG_SUFFIX}
- WTF${DEBUG_SUFFIX}
)
if (ENABLE_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA_V2)
@@ -3420,7 +3419,6 @@
set(WebCoreTestSupport_LIBRARIES
PRIVATE _javascript_Core${DEBUG_SUFFIX}
- PRIVATE WTF${DEBUG_SUFFIX}
)
# Modules that the bindings generator scripts may use
Modified: trunk/Source/WebCore/ChangeLog (199256 => 199257)
--- trunk/Source/WebCore/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
@@ -1,3 +1,16 @@
+2016-04-08 Alex Christensen <[email protected]>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+ On Mac, WTF is a static library that is linked only with _javascript_Core.
+
2016-04-08 Jer Noble <[email protected]>
Unreviewed 32-bit build fix; make type of std::min<> explicit.
Modified: trunk/Source/WebCore/PlatformGTK.cmake (199256 => 199257)
--- trunk/Source/WebCore/PlatformGTK.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -280,8 +280,11 @@
${X11_Xrender_LIB}
${X11_Xt_LIB}
${ZLIB_LIBRARIES}
+ WTF
)
+list(APPEND WebCoreTestSupport_LIBRARIES WTF)
+
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
${CAIRO_INCLUDE_DIRS}
Modified: trunk/Source/WebCore/PlatformMac.cmake (199256 => 199257)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -934,3 +934,5 @@
testing/MockContentFilter.cpp
testing/MockContentFilterSettings.cpp
)
+
+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
Modified: trunk/Source/WebCore/PlatformWin.cmake (199256 => 199257)
--- trunk/Source/WebCore/PlatformWin.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/PlatformWin.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -307,3 +307,6 @@
set(WebCore_OUTPUT_NAME
WebCore${DEBUG_SUFFIX}
)
+
+list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
+list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})
Modified: trunk/Source/WebKit/CMakeLists.txt (199256 => 199257)
--- trunk/Source/WebKit/CMakeLists.txt 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-04-09 00:36:06 UTC (rev 199257)
@@ -34,7 +34,6 @@
set(WebKit_LIBRARIES
PRIVATE _javascript_Core${DEBUG_SUFFIX}
- PRIVATE WTF${DEBUG_SUFFIX}
PRIVATE WebCore${DEBUG_SUFFIX}
)
Modified: trunk/Source/WebKit/ChangeLog (199256 => 199257)
--- trunk/Source/WebKit/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
@@ -1,3 +1,14 @@
+2016-04-08 Alex Christensen <[email protected]>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+
2016-04-08 Konstantin Tokarev <[email protected]>
[cmake] Use ICU include dirs in WebKit.
Modified: trunk/Source/WebKit/PlatformMac.cmake (199256 => 199257)
--- trunk/Source/WebKit/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -388,3 +388,5 @@
file(WRITE ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/${_file} "#import <WebCore/${_file}>")
endif ()
endforeach ()
+
+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
Modified: trunk/Source/WebKit/PlatformWin.cmake (199256 => 199257)
--- trunk/Source/WebKit/PlatformWin.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit/PlatformWin.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -36,6 +36,8 @@
)
endif ()
+list(APPEND WebKit_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
+
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitVersion.h
MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
Modified: trunk/Source/WebKit2/CMakeLists.txt (199256 => 199257)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-04-09 00:36:06 UTC (rev 199257)
@@ -903,6 +903,7 @@
add_custom_target(WebContentProcessNib COMMAND
ibtool --compile ${_web_xpc_dir}/Resources/WebContentProcess.nib ${WEBKIT2_DIR}/Resources/WebContentProcess.xib
VERBATIM)
+ add_dependencies(WebKit2 WebContentProcessNib)
# FIXME: This shouldn't be two operations.
file(COPY ${WEBKIT2_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist DESTINATION ${_web_xpc_dir})
@@ -913,7 +914,6 @@
set(_net_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.Networking.Development.xpc/Contents)
make_directory(${_net_xpc_dir}/MacOS)
- make_directory(${_net_xpc_dir}/Resources)
make_directory(${_net_xpc_dir}/_CodeSignature)
# FIXME: This shouldn't be two operations.
Modified: trunk/Source/WebKit2/ChangeLog (199256 => 199257)
--- trunk/Source/WebKit2/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
@@ -1,5 +1,16 @@
2016-04-08 Alex Christensen <[email protected]>
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ Put the xpc service binaries in the right place.
+
+2016-04-08 Alex Christensen <[email protected]>
+
Build fix with IndexedDB disabled but DatabaseProcess enabled after r199230
https://bugs.webkit.org/show_bug.cgi?id=156321
Modified: trunk/Source/WebKit2/PlatformMac.cmake (199256 => 199257)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -417,10 +417,6 @@
"${WEBCORE_DIR}/page"
)
-set(WEBKIT2_EXTRA_DEPENDENCIES
- WebKit2-forwarding-headers
-)
-
set(XPCService_SOURCES
Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
@@ -447,8 +443,8 @@
)
# FIXME: These should not have Development in production builds.
-set(WebKit2_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development.xpc)
-set(WebKit2_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development.xpc)
+set(WebKit2_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)
+set(WebKit2_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
add_definitions("-include WebKit2Prefix.h")
Modified: trunk/Source/cmake/OptionsMac.cmake (199256 => 199257)
--- trunk/Source/cmake/OptionsMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/cmake/OptionsMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -116,7 +116,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY PRIVATE OFF)
Modified: trunk/Source/cmake/WebKitMacros.cmake (199256 => 199257)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-04-09 00:36:06 UTC (rev 199257)
@@ -267,7 +267,7 @@
add_custom_command(TARGET ${_target} POST_BUILD COMMAND ${${_target}_POST_BUILD_COMMAND} VERBATIM)
endif ()
- if (APPLE AND NOT PORT STREQUAL "GTK")
+ if (APPLE AND NOT PORT STREQUAL "GTK" AND NOT ${_target} STREQUAL "WTF")
set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
install(TARGETS ${_target} FRAMEWORK DESTINATION ${LIB_INSTALL_DIR})
endif ()
