Changeset 251855 in webkit

Timestamp:

Oct 31, 2019, 10:33:30 AM (6 years ago)

Author:

achristensen@apple.com

Message:

CMake build should make WebKit framework able to be used by Safari
​https://bugs.webkit.org/show_bug.cgi?id=203685

Rubber-stamped by Tim Horton.

.:

• Source/cmake/OptionsMac.cmake:

Source/JavaScriptCore:

• PlatformMac.cmake:

Source/WebKit:

• PlatformMac.cmake:

Source/WebKitLegacy:

• PlatformMac.cmake:

Tools:

• DumpRenderTree/PlatformMac.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/PlatformMac.cmake (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/PlatformMac.cmake (modified) (2 diffs)
• Source/WebKitLegacy/ChangeLog (modified) (1 diff)
• Source/WebKitLegacy/PlatformMac.cmake (modified) (1 diff)
• Source/cmake/OptionsMac.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/PlatformMac.cmake (modified) (1 diff)

trunk/ChangeLog ¶

@@ +1 @@
+2019-10-31  Alex Christensen  <achristensen@webkit.org>
+
+        CMake build should make WebKit framework able to be used by Safari
+        https://bugs.webkit.org/show_bug.cgi?id=203685
+
+        Rubber-stamped by Tim Horton.
+
+        * Source/cmake/OptionsMac.cmake:
+
 2019-10-29  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/JavaScriptCore/ChangeLog ¶

@@ +1 @@
+2019-10-31  Alex Christensen  <achristensen@webkit.org>
+
+        CMake build should make WebKit framework able to be used by Safari
+        https://bugs.webkit.org/show_bug.cgi?id=203685
+
+        Rubber-stamped by Tim Horton.
+
+        * PlatformMac.cmake:
+
 2019-10-31  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/PlatformMac.cmake ¶

@@ -20 +20 @@
     API/JSContext.h
     API/JSContextPrivate.h
+    API/JSContextRefPrivate.h
     API/JSExport.h
     API/JSManagedValue.h
@@ -36 +37 @@
 
 # FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
+if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AugmentableInspectorControllerClient.h)
+    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AugmentableInspectorControllerClient.h "#include \"inspector/augmentable/AugmentableInspectorControllerClient.h\"")
+endif ()
+if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendRouter.h)
+    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendRouter.h "#include \"inspector/InspectorFrontendRouter.h\"")
+endif ()
+if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatcher.h)
+    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatcher.h "#include \"inspector/InspectorBackendDispatcher.h\"")
+endif ()
 if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h)
     file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")

trunk/Source/WebKit/ChangeLog ¶

@@ +1 @@
+2019-10-31  Alex Christensen  <achristensen@webkit.org>
+
+        CMake build should make WebKit framework able to be used by Safari
+        https://bugs.webkit.org/show_bug.cgi?id=203685
+
+        Rubber-stamped by Tim Horton.
+
+        * PlatformMac.cmake:
+
 2019-10-31  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/PlatformMac.cmake ¶

@@ -38 +38 @@
     UIProcess/Cocoa/WKShareSheet.mm
     UIProcess/Cocoa/WKStorageAccessAlert.mm
+
+    WebProcess/InjectedBundle/API/c/mac/WKBundlePageMac.mm
 )
 
@@ -477 +479 @@
         ${WebKit_NetworkProcess_OUTPUT_NAME})
 
+    set(WebKit_RESOURCES_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/Resources)
+    add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb COMMAND
+        grep -o "^[^;]*" ${WEBKIT_DIR}/WebProcess/com.apple.WebProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${FORWARDING_HEADERS_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb
+        VERBATIM)
+    add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb COMMAND
+        grep -o "^[^;]*" ${WEBKIT_DIR}/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${FORWARDING_HEADERS_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb
+        VERBATIM)
+    add_custom_target(WebKitSandboxProfiles ALL DEPENDS ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb)
+    add_dependencies(WebKit WebKitSandboxProfiles)
+
     add_custom_command(OUTPUT ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib COMMAND
         ibtool --compile ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib ${WEBKIT_DIR}/Resources/WebContentProcess.xib

trunk/Source/WebKitLegacy/ChangeLog ¶

@@ +1 @@
+2019-10-31  Alex Christensen  <achristensen@webkit.org>
+
+        CMake build should make WebKit framework able to be used by Safari
+        https://bugs.webkit.org/show_bug.cgi?id=203685
+
+        Rubber-stamped by Tim Horton.
+
+        * PlatformMac.cmake:
+
 2019-10-01  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKitLegacy/PlatformMac.cmake ¶

@@ -639 +639 @@
 endforeach ()
 
-file(COPY
-    mac/Plugins/Hosted/WebKitPluginAgent.defs
-    mac/Plugins/Hosted/WebKitPluginAgentReply.defs
-    mac/Plugins/Hosted/WebKitPluginClient.defs
-    mac/Plugins/Hosted/WebKitPluginHost.defs
-    mac/Plugins/Hosted/WebKitPluginHostTypes.defs
-    mac/Plugins/Hosted/WebKitPluginHostTypes.h
-DESTINATION ${WebKitLegacy_DERIVED_SOURCES_DIR})
+if (NOT EXISTS ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginHostTypes.h)
+    file(COPY
+        mac/Plugins/Hosted/WebKitPluginAgent.defs
+        mac/Plugins/Hosted/WebKitPluginAgentReply.defs
+        mac/Plugins/Hosted/WebKitPluginClient.defs
+        mac/Plugins/Hosted/WebKitPluginHost.defs
+        mac/Plugins/Hosted/WebKitPluginHostTypes.defs
+        mac/Plugins/Hosted/WebKitPluginHostTypes.h
+        DESTINATION ${WebKitLegacy_DERIVED_SOURCES_DIR})
+endif ()
 
 add_custom_command(

trunk/Source/cmake/OptionsMac.cmake ¶

@@ -29 +29 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)

trunk/Tools/ChangeLog ¶

@@ +1 @@
+2019-10-31  Alex Christensen  <achristensen@webkit.org>
+
+        CMake build should make WebKit framework able to be used by Safari
+        https://bugs.webkit.org/show_bug.cgi?id=203685
+
+        Rubber-stamped by Tim Horton.
+
+        * DumpRenderTree/PlatformMac.cmake:
+
 2019-10-31  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/DumpRenderTree/PlatformMac.cmake ¶

@@ -139 +139 @@
 file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
 foreach (_file ${DumpRenderTree_RESOURCES})
-    file(COPY ${TOOLS_DIR}/DumpRenderTree/fonts/${_file} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
+    if (NOT EXISTS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources/${_file})
+        file(COPY ${TOOLS_DIR}/DumpRenderTree/fonts/${_file} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
+    endif ()
 endforeach ()