Changeset 251855 in webkit


Ignore:
Timestamp:
Oct 31, 2019 10:33:30 AM (4 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:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r251702 r251855  
     12019-10-31  Alex Christensen  <achristensen@webkit.org>
     2
     3        CMake build should make WebKit framework able to be used by Safari
     4        https://bugs.webkit.org/show_bug.cgi?id=203685
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * Source/cmake/OptionsMac.cmake:
     9
    1102019-10-29  Adrian Perez de Castro  <aperez@igalia.com>
    211

  • trunk/Source/JavaScriptCore/ChangeLog

    r251852 r251855  
     12019-10-31  Alex Christensen  <achristensen@webkit.org>
     2
     3        CMake build should make WebKit framework able to be used by Safari
     4        https://bugs.webkit.org/show_bug.cgi?id=203685
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * PlatformMac.cmake:
     9
    1102019-10-31  Yusuke Suzuki  <ysuzuki@apple.com>
    211

  • trunk/Source/JavaScriptCore/PlatformMac.cmake

    r250550 r251855  
    2020    API/JSContext.h
    2121    API/JSContextPrivate.h
     22    API/JSContextRefPrivate.h
    2223    API/JSExport.h
    2324    API/JSManagedValue.h
    … …  
    3637
    3738# FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
     39if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AugmentableInspectorControllerClient.h)
     40    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AugmentableInspectorControllerClient.h "#include \"inspector/augmentable/AugmentableInspectorControllerClient.h\"")
     41endif ()
     42if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendRouter.h)
     43    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendRouter.h "#include \"inspector/InspectorFrontendRouter.h\"")
     44endif ()
     45if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatcher.h)
     46    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatcher.h "#include \"inspector/InspectorBackendDispatcher.h\"")
     47endif ()
    3848if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h)
    3949    file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")

  • trunk/Source/WebKit/ChangeLog

    r251854 r251855  
     12019-10-31  Alex Christensen  <achristensen@webkit.org>
     2
     3        CMake build should make WebKit framework able to be used by Safari
     4        https://bugs.webkit.org/show_bug.cgi?id=203685
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * PlatformMac.cmake:
     9
    1102019-10-31  Brady Eidson  <beidson@apple.com>
    211

  • trunk/Source/WebKit/PlatformMac.cmake

    r251831 r251855  
    3838    UIProcess/Cocoa/WKShareSheet.mm
    3939    UIProcess/Cocoa/WKStorageAccessAlert.mm
     40
     41    WebProcess/InjectedBundle/API/c/mac/WKBundlePageMac.mm
    4042)
    4143
    … …  
    477479        ${WebKit_NetworkProcess_OUTPUT_NAME})
    478480
     481    set(WebKit_RESOURCES_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/Resources)
     482    add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb COMMAND
     483        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
     484        VERBATIM)
     485    add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb COMMAND
     486        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
     487        VERBATIM)
     488    add_custom_target(WebKitSandboxProfiles ALL DEPENDS ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb)
     489    add_dependencies(WebKit WebKitSandboxProfiles)
     490
    479491    add_custom_command(OUTPUT ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib COMMAND
    480492        ibtool --compile ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib ${WEBKIT_DIR}/Resources/WebContentProcess.xib

  • trunk/Source/WebKitLegacy/ChangeLog

    r250579 r251855  
     12019-10-31  Alex Christensen  <achristensen@webkit.org>
     2
     3        CMake build should make WebKit framework able to be used by Safari
     4        https://bugs.webkit.org/show_bug.cgi?id=203685
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * PlatformMac.cmake:
     9
    1102019-10-01  Alex Christensen  <achristensen@webkit.org>
    211

  • trunk/Source/WebKitLegacy/PlatformMac.cmake

    r250579 r251855  
    639639endforeach ()
    640640
    641 file(COPY
    642     mac/Plugins/Hosted/WebKitPluginAgent.defs
    643     mac/Plugins/Hosted/WebKitPluginAgentReply.defs
    644     mac/Plugins/Hosted/WebKitPluginClient.defs
    645     mac/Plugins/Hosted/WebKitPluginHost.defs
    646     mac/Plugins/Hosted/WebKitPluginHostTypes.defs
    647     mac/Plugins/Hosted/WebKitPluginHostTypes.h
    648 DESTINATION ${WebKitLegacy_DERIVED_SOURCES_DIR})
     641if (NOT EXISTS ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginHostTypes.h)
     642    file(COPY
     643        mac/Plugins/Hosted/WebKitPluginAgent.defs
     644        mac/Plugins/Hosted/WebKitPluginAgentReply.defs
     645        mac/Plugins/Hosted/WebKitPluginClient.defs
     646        mac/Plugins/Hosted/WebKitPluginHost.defs
     647        mac/Plugins/Hosted/WebKitPluginHostTypes.defs
     648        mac/Plugins/Hosted/WebKitPluginHostTypes.h
     649        DESTINATION ${WebKitLegacy_DERIVED_SOURCES_DIR})
     650endif ()
    649651
    650652add_custom_command(

  • trunk/Source/cmake/OptionsMac.cmake

    r250625 r251855  
    2929WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE OFF)
    3030WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE OFF)
     31WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS PRIVATE ON)
    3132WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON)
    3233WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)

  • trunk/Tools/ChangeLog

    r251849 r251855  
     12019-10-31  Alex Christensen  <achristensen@webkit.org>
     2
     3        CMake build should make WebKit framework able to be used by Safari
     4        https://bugs.webkit.org/show_bug.cgi?id=203685
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * DumpRenderTree/PlatformMac.cmake:
     9
    1102019-10-31  Aakash Jain  <aakash_jain@apple.com>
    211

  • trunk/Tools/DumpRenderTree/PlatformMac.cmake

    r251831 r251855  
    139139file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
    140140foreach (_file ${DumpRenderTree_RESOURCES})
    141     file(COPY ${TOOLS_DIR}/DumpRenderTree/fonts/${_file} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
     141    if (NOT EXISTS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources/${_file})
     142        file(COPY ${TOOLS_DIR}/DumpRenderTree/fonts/${_file} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
     143    endif ()
    142144endforeach ()
Note: See TracChangeset for help on using the changeset viewer.