Changeset 244065 in webkit


Ignore:
Timestamp:
Apr 8, 2019 6:38:50 PM (5 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake][WinCairo] Separate copied headers into different directories
​https://bugs.webkit.org/show_bug.cgi?id=196655

Reviewed by Michael Catanzaro.

.:

Add variables for the paths to copied framework headers. This is done to be
explicit rather than relying on ${FORWARDING_HEADERS_DIR}.

Currently all ports but WinCairo will default to ${FORWARDING_HEADERS_DIR}.
WinCairo overrides them to provide a directory structure that looks more
like what happens in an XCode build. This is meant as an intermediate step
towards making all CMake ports behave like this.

  • Source/cmake/OptionsWinCairo.cmake:
  • Source/cmake/WebKitFS.cmake:
  • Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

  • CMakeLists.txt:
  • shell/PlatformWin.cmake:

Source/WebCore:

  • CMakeLists.txt:
  • PlatformWin.cmake:

Source/WebCore/PAL:

  • pal/CMakeLists.txt:

Source/WebKit:

  • CMakeLists.txt:
  • PlatformWin.cmake:

Source/WebKitLegacy:

  • CMakeLists.txt:
  • PlatformWin.cmake:

Source/WTF:

  • wtf/CMakeLists.txt:

Tools:

  • DumpRenderTree/CMakeLists.txt:
  • MiniBrowser/win/CMakeLists.txt:
  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/PlatformWin.cmake:
Location:
trunk
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r243989 r244065  
     12019-04-08  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WinCairo] Separate copied headers into different directories
     4        https://bugs.webkit.org/show_bug.cgi?id=196655
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Add variables for the paths to copied framework headers. This is done to be
     9        explicit rather than relying on ${FORWARDING_HEADERS_DIR}.
     10
     11        Currently all ports but WinCairo will default to ${FORWARDING_HEADERS_DIR}.
     12        WinCairo overrides them to provide a directory structure that looks more
     13        like what happens in an XCode build. This is meant as an intermediate step
     14        towards making all CMake ports behave like this.
     15
     16        * Source/cmake/OptionsWinCairo.cmake:
     17        * Source/cmake/WebKitFS.cmake:
     18        * Source/cmake/WebKitMacros.cmake:
     19
    1202019-04-08  Xan Lopez  <xan@igalia.com>
    221

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r244044 r244065  
    88
    99set(JavaScriptCore_INCLUDE_DIRECTORIES
    10     "${FORWARDING_HEADERS_DIR}"
     10    "${WTF_FRAMEWORK_HEADERS_DIR}"
     11    "${JavaScriptCore_FRAMEWORK_HEADERS_DIR}"
    1112)
    1213
    … …  
    301302
    302303target_link_libraries(LLIntSettingsExtractor WTF)
    303 add_dependencies(LLIntSettingsExtractor JavaScriptCoreForwardingHeaders)
     304add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders)
    304305target_link_libraries(LLIntOffsetsExtractor WTF)
    305 add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
     306add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders)
    306307
    307308# The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
    … …  
    12751276
    12761277WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
     1278    TARGET_NAME JavaScriptCoreFrameworkHeaders
     1279    DESTINATION ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
    12771280    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
    12781281    FLATTENED
    … …  
    12801283
    12811284WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
    1282     TARGET_NAME JavaScriptCorePrivateForwardingHeaders
     1285    TARGET_NAME JavaScriptCorePrivateFrameworkHeaders
     1286    DESTINATION ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
    12831287    FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
    12841288    FLATTENED

  • trunk/Source/JavaScriptCore/ChangeLog

    r244058 r244065  
     12019-04-08  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WinCairo] Separate copied headers into different directories
     4        https://bugs.webkit.org/show_bug.cgi?id=196655
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * CMakeLists.txt:
     9        * shell/PlatformWin.cmake:
     10
    1112019-04-08  Yusuke Suzuki  <ysuzuki@apple.com>
    212

  • trunk/Source/JavaScriptCore/shell/PlatformWin.cmake

    r234248 r244065  
    1 include_directories(./ PRIVATE ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
     1include_directories(./ PRIVATE ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR})
    22include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
    33add_library(jscLib SHARED ${JSC_SOURCES})

  • trunk/Source/WTF/ChangeLog

    r244000 r244065  
     12019-04-08  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WinCairo] Separate copied headers into different directories
     4        https://bugs.webkit.org/show_bug.cgi?id=196655
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * wtf/CMakeLists.txt:
     9
    1102019-04-08  Guillaume Emont  <guijemont@igalia.com>
    211

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r243934 r244065  
    503503
    504504WEBKIT_MAKE_FORWARDING_HEADERS(WTF
    505     DESTINATION ${FORWARDING_HEADERS_DIR}/wtf
     505    TARGET_NAME WTFFrameworkHeaders
     506    DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
    506507    FILES ${WTF_PUBLIC_HEADERS}
    507508)

  • trunk/Source/WebCore/CMakeLists.txt

    r243934 r244065  
    1818set(WebCore_INCLUDE_DIRECTORIES
    1919    "${CMAKE_BINARY_DIR}"
     20    "${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
     21    "${PAL_FRAMEWORK_HEADERS_DIR}"
    2022    "${WEBCORE_DIR}"
    2123    "${WEBCORE_DIR}/Modules/airplay"

  • trunk/Source/WebCore/ChangeLog

    r244061 r244065  
     12019-04-08  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WinCairo] Separate copied headers into different directories
     4        https://bugs.webkit.org/show_bug.cgi?id=196655
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * CMakeLists.txt:
     9        * PlatformWin.cmake:
     10
    1112019-04-08  Chris Fleizach  <cfleizach@apple.com>
    212

  • trunk/Source/WebCore/PAL/ChangeLog

    r244050 r244065  
     12019-04-08  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WinCairo] Separate copied headers into different directories
     4        https://bugs.webkit.org/show_bug.cgi?id=196655
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * pal/CMakeLists.txt:
     9
    1102019-04-08  Justin Fan  <justin_fan@apple.com>
    211

  • trunk/Source/WebCore/PAL/pal/CMakeLists.txt

    r232550 r244065  
    5151
    5252WEBKIT_MAKE_FORWARDING_HEADERS(PAL
    53     DESTINATION ${FORWARDING_HEADERS_DIR}/pal
     53    TARGET_NAME PALFrameworkHeaders
     54    DESTINATION ${PAL_FRAMEWORK_HEADERS_DIR}/pal
    5455    FILES ${PAL_PUBLIC_HEADERS}
    5556)

  • trunk/Source/WebCore/PlatformWin.cmake

    r243934 r244065  
    355355
    356356WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
     357    TARGET_NAME WebCorePrivateFrameworkHeaders
     358    DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
    357359    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
    358360    DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES}
    … …  
    360362)
    361363
    362 add_dependencies(WebCoreForwardingHeaders WebCoreBindings)
     364add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)
    363365
    364366set(WebCore_OUTPUT_NAME

  • trunk/Source/WebKit/CMakeLists.txt

    r243934 r244065  
    44
    55set(WebKit_INCLUDE_DIRECTORIES
     6    "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
     7    "${WebKit_FRAMEWORK_HEADERS_DIR}"
    68    "${WEBKIT_DIR}"
    79    "${WEBKIT_DIR}/NetworkProcess"

  • trunk/Source/WebKit/ChangeLog

    r244056 r244065  
     12019-04-08  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WinCairo] Separate copied headers into different directories
     4        https://bugs.webkit.org/show_bug.cgi?id=196655
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * CMakeLists.txt:
     9        * PlatformWin.cmake:
     10
    1112019-04-08  Wenson Hsieh  <wenson_hsieh@apple.com>
    212

  • trunk/Source/WebKit/PlatformWin.cmake

    r242346 r244065  
    218218
    219219WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
     220    TARGET_NAME WebKitFrameworkHeaders
     221    DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit
    220222    DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES}
    221223    FLATTENED

  • trunk/Source/WebKitLegacy/CMakeLists.txt

    r243934 r244065  
    2222    "${WEBKITLEGACY_DIR}/Storage"
    2323    "${WEBKITLEGACY_DIR}/WebCoreSupport"
    24     "${FORWARDING_HEADERS_DIR}"
     24    "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
    2525)
    2626

  • trunk/Source/WebKitLegacy/ChangeLog

    r243934 r244065  
     12019-04-08  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WinCairo] Separate copied headers into different directories
     4        https://bugs.webkit.org/show_bug.cgi?id=196655
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * CMakeLists.txt:
     9        * PlatformWin.cmake:
     10
    1112019-04-05  Commit Queue  <commit-queue@webkit.org>
    212

  • trunk/Source/WebKitLegacy/PlatformWin.cmake

    r243934 r244065  
    487487
    488488WEBKIT_MAKE_FORWARDING_HEADERS(WebKitLegacyGUID
    489     DESTINATION ${FORWARDING_HEADERS_DIR}/WebKitLegacy
     489    TARGET_NAME WebKitLegacyFrameworkHeaders
     490    DESTINATION ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}/WebKitLegacy
    490491    FILES ${WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS}
    491492    FLATTENED

  • trunk/Source/cmake/OptionsWinCairo.cmake

    r237118 r244065  
    3838
    3939add_definitions(-DWTF_PLATFORM_WIN_CAIRO=1)
     40
     41# Override headers directories
     42set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WTF/Headers)
     43set(JavaScriptCore_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Headers)
     44set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/PrivateHeaders)
     45set(PAL_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/PAL/Headers)
     46set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebCore/PrivateHeaders)
     47set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/Headers)
     48set(WebKit_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/Headers)
     49set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/PrivateHeaders)

  • trunk/Source/cmake/WebKitFS.cmake

    r243934 r244065  
    4242set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
    4343
     44set(WTF_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
     45set(JavaScriptCore_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
     46set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
     47set(PAL_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
     48set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
     49set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
     50set(WebKit_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
     51set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
     52
    4453file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
    4554file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)

  • trunk/Source/cmake/WebKitMacros.cmake

    r243746 r244065  
    240240    cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
    241241    set(headers ${opt_FILES})
    242     if (opt_DESTINATION)
    243         set(destination ${opt_DESTINATION})
    244     else ()
    245         set(destination ${FORWARDING_HEADERS_DIR}/${framework})
    246     endif ()
    247     file(MAKE_DIRECTORY ${destination})
     242    file(MAKE_DIRECTORY ${opt_DESTINATION})
    248243    foreach (dir IN LISTS opt_DIRECTORIES)
    249244        file(GLOB files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${dir}/*.h)
    … …  
    259254        if (opt_FLATTENED)
    260255            get_filename_component(header_filename ${header} NAME)
    261             set(fwd_header ${destination}/${header_filename})
     256            set(fwd_header ${opt_DESTINATION}/${header_filename})
    262257        else ()
    263258            get_filename_component(header_dir ${header} DIRECTORY)
    264             file(MAKE_DIRECTORY ${destination}/${header_dir})
    265             set(fwd_header ${destination}/${header})
     259            file(MAKE_DIRECTORY ${opt_DESTINATION}/${header_dir})
     260            set(fwd_header ${opt_DESTINATION}/${header})
    266261        endif ()
    267262        add_custom_command(OUTPUT ${fwd_header}

  • trunk/Tools/ChangeLog

    r244064 r244065  
     12019-04-08  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WinCairo] Separate copied headers into different directories
     4        https://bugs.webkit.org/show_bug.cgi?id=196655
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * DumpRenderTree/CMakeLists.txt:
     9        * MiniBrowser/win/CMakeLists.txt:
     10        * TestWebKitAPI/CMakeLists.txt:
     11        * TestWebKitAPI/PlatformWin.cmake:
     12
    1132019-04-08  Jonathan Bedard  <jbedard@apple.com>
    214

  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r243934 r244065  
    2828
    2929set(DumpRenderTree_INCLUDE_DIRECTORIES
     30    ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
    3031    ${DERIVED_SOURCES_DIR}/DumpRenderTree
    3132    ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}

  • trunk/Tools/MiniBrowser/win/CMakeLists.txt

    r243934 r244065  
    11set(MiniBrowser_INCLUDE_DIRECTORIES
    2     "${FORWARDING_HEADERS_DIR}"
    3     "${FORWARDING_HEADERS_DIR}/WebKitLegacy"
    4     "${CMAKE_SOURCE_DIR}"
    5     "${CMAKE_SOURCE_DIR}/Source"
     2    ${WTF_FRAMEWORK_HEADERS_DIR}
     3    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
     4    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     5    ${PAL_FRAMEWORK_HEADERS_DIR}
     6    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     7    ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
     8    ${WebKit_FRAMEWORK_HEADERS_DIR}
     9    ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}
    610)
    711

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r243934 r244065  
    1616
    1717set(TestWebKitAPI_DEPENDENCIES
    18     JavaScriptCoreForwardingHeaders
    19     JavaScriptCorePrivateForwardingHeaders
    20     WTFForwardingHeaders
     18    JavaScriptCoreFrameworkHeaders
     19    JavaScriptCorePrivateFrameworkHeaders
     20    WTFFrameworkHeaders
    2121)
    2222
    2323if (ENABLE_WEBCORE)
    24     list(APPEND TestWebKitAPI_DEPENDENCIES PALForwardingHeaders)
     24    list(APPEND TestWebKitAPI_DEPENDENCIES PALFrameworkHeaders)
    2525endif ()
    2626

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r243934 r244065  
    1717    ${TESTWEBKITAPI_DIR}/win
    1818    ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
     19    ${WTF_FRAMEWORK_HEADERS_DIR}
     20    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
     21    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     22    ${PAL_FRAMEWORK_HEADERS_DIR}
     23    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     24    ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
     25    ${WebKit_FRAMEWORK_HEADERS_DIR}
     26    ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}
    1927)
    2028
    … …  
    100108endif ()
    101109
    102 list(APPEND TestWebKitAPI_DEPENDENCIES WebCoreForwardingHeaders)
     110list(APPEND TestWebKitAPI_DEPENDENCIES WebCorePrivateFrameworkHeaders)
    103111if (ENABLE_WEBKIT)
    104     list(APPEND TestWebKitAPI_DEPENDENCIES WebKitForwardingHeaders)
     112    list(APPEND TestWebKitAPI_DEPENDENCIES WebKitFrameworkHeaders)
    105113endif ()
    106114
Note: See TracChangeset for help on using the changeset viewer.