⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 243934 in webkit


Ignore:
Timestamp:
Apr 5, 2019, 8:35:32 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r243833.
​https://bugs.webkit.org/show_bug.cgi?id=196645

This change breaks build of WPE and GTK ports (Requested by
annulen on #webkit).

Reverted changeset:

"[CMake][WTF] Mirror XCode header directories"
​https://bugs.webkit.org/show_bug.cgi?id=191662
​https://trac.webkit.org/changeset/243833

Location:
trunk
Files:
1 deleted
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r243833 r243934  
     12019-04-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r243833.
     4        https://bugs.webkit.org/show_bug.cgi?id=196645
     5
     6        This change breaks build of WPE and GTK ports (Requested by
     7        annulen on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[CMake][WTF] Mirror XCode header directories"
     12        https://bugs.webkit.org/show_bug.cgi?id=191662
     13        https://trac.webkit.org/changeset/243833
     14
    1152019-04-03  Don Olmstead  <don.olmstead@sony.com>
    216

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r243886 r243934  
    11cmake_minimum_required(VERSION 2.8.12)
    22include(WebKitCommon)
    3 include(frameworks/WTF)
    43set_property(DIRECTORY . PROPERTY FOLDER "JavaScriptCore")
    54
    … …  
    121120
    122121set(JavaScriptCore_LIBRARIES
    123     WTFFramework
     122    WTF${DEBUG_SUFFIX}
    124123    ${ICU_I18N_LIBRARIES}
    125124)
    … …  
    301300)
    302301
    303 target_link_libraries(LLIntSettingsExtractor WTFFramework)
     302target_link_libraries(LLIntSettingsExtractor WTF)
    304303add_dependencies(LLIntSettingsExtractor JavaScriptCoreForwardingHeaders)
    305 target_link_libraries(LLIntOffsetsExtractor WTFFramework)
     304target_link_libraries(LLIntOffsetsExtractor WTF)
    306305add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
    307306

  • trunk/Source/JavaScriptCore/ChangeLog

    r243933 r243934  
     12019-04-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r243833.
     4        https://bugs.webkit.org/show_bug.cgi?id=196645
     5
     6        This change breaks build of WPE and GTK ports (Requested by
     7        annulen on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[CMake][WTF] Mirror XCode header directories"
     12        https://bugs.webkit.org/show_bug.cgi?id=191662
     13        https://trac.webkit.org/changeset/243833
     14
    1152019-04-05  Caitlin Potter  <caitp@igalia.com>
    216

  • trunk/Source/JavaScriptCore/shell/CMakeLists.txt

    r243833 r243934  
    66    ${CMAKE_DL_LIBS}
    77    JavaScriptCore${DEBUG_SUFFIX}
    8     WTFFramework
     8    WTF${DEBUG_SUFFIX}
    99)
    1010

  • trunk/Source/WTF/ChangeLog

    r243929 r243934  
     12019-04-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r243833.
     4        https://bugs.webkit.org/show_bug.cgi?id=196645
     5
     6        This change breaks build of WPE and GTK ports (Requested by
     7        annulen on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[CMake][WTF] Mirror XCode header directories"
     12        https://bugs.webkit.org/show_bug.cgi?id=191662
     13        https://trac.webkit.org/changeset/243833
     14
    1152019-04-05  Ryosuke Niwa  <rniwa@webkit.org>
    216

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

    r243833 r243934  
    503503
    504504WEBKIT_MAKE_FORWARDING_HEADERS(WTF
    505     TARGET_NAME WTFFrameworkHeaders
    506     DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
     505    DESTINATION ${FORWARDING_HEADERS_DIR}/wtf
    507506    FILES ${WTF_PUBLIC_HEADERS}
    508507)

  • trunk/Source/WebCore/CMakeLists.txt

    r243833 r243934  
    33include(WebKitCommon)
    44include(WebCoreMacros.cmake)
    5 include(frameworks/WTF)
    65
    76set_property(DIRECTORY . PROPERTY FOLDER "WebCore")

  • trunk/Source/WebCore/ChangeLog

    r243931 r243934  
     12019-04-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r243833.
     4        https://bugs.webkit.org/show_bug.cgi?id=196645
     5
     6        This change breaks build of WPE and GTK ports (Requested by
     7        annulen on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[CMake][WTF] Mirror XCode header directories"
     12        https://bugs.webkit.org/show_bug.cgi?id=191662
     13        https://trac.webkit.org/changeset/243833
     14
    1152019-04-05  David Kilzer  <ddkilzer@apple.com>
    216

  • trunk/Source/WebCore/PlatformWin.cmake

    r243833 r243934  
    366366)
    367367
    368 list(APPEND WebCore_LIBRARIES WTFFramework)
     368list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
    369369if (TARGET libEGL)
    370370    list(APPEND WebCore_LIBRARIES libEGL)
    371371endif ()
    372 list(APPEND WebCoreTestSupport_LIBRARIES WTFFramework)
     372list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})

  • trunk/Source/WebDriver/CMakeLists.txt

    r243833 r243934  
    1818
    1919set(WebDriver_LIBRARIES
    20     WTFFramework
     20    WTF
    2121)
    2222

  • trunk/Source/WebDriver/ChangeLog

    r243833 r243934  
     12019-04-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r243833.
     4        https://bugs.webkit.org/show_bug.cgi?id=196645
     5
     6        This change breaks build of WPE and GTK ports (Requested by
     7        annulen on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[CMake][WTF] Mirror XCode header directories"
     12        https://bugs.webkit.org/show_bug.cgi?id=191662
     13        https://trac.webkit.org/changeset/243833
     14
    1152019-04-03  Don Olmstead  <don.olmstead@sony.com>
    216

  • trunk/Source/WebKit/CMakeLists.txt

    r243833 r243934  
    11include(WebKitCommon)
    2 include(frameworks/WTF)
    32
    43set_property(DIRECTORY . PROPERTY FOLDER "WebKit")

  • trunk/Source/WebKit/ChangeLog

    r243932 r243934  
     12019-04-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r243833.
     4        https://bugs.webkit.org/show_bug.cgi?id=196645
     5
     6        This change breaks build of WPE and GTK ports (Requested by
     7        annulen on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[CMake][WTF] Mirror XCode header directories"
     12        https://bugs.webkit.org/show_bug.cgi?id=191662
     13        https://trac.webkit.org/changeset/243833
     14
    1152019-04-05  David Kilzer  <ddkilzer@apple.com>
    216

  • trunk/Source/WebKitLegacy/CMakeLists.txt

    r243833 r243934  
    11cmake_minimum_required(VERSION 2.8.12)
    22include(WebKitCommon)
    3 include(frameworks/WTF)
    43set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy")
    54

  • trunk/Source/WebKitLegacy/ChangeLog

    r243833 r243934  
     12019-04-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r243833.
     4        https://bugs.webkit.org/show_bug.cgi?id=196645
     5
     6        This change breaks build of WPE and GTK ports (Requested by
     7        annulen on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[CMake][WTF] Mirror XCode header directories"
     12        https://bugs.webkit.org/show_bug.cgi?id=191662
     13        https://trac.webkit.org/changeset/243833
     14
    1152019-04-03  Don Olmstead  <don.olmstead@sony.com>
    216

  • trunk/Source/WebKitLegacy/PlatformWin.cmake

    r243833 r243934  
    3535endif ()
    3636
    37 list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTFFramework)
     37list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
    3838
    3939add_custom_command(

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r243833 r243934  
     12019-04-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r243833.
     4        https://bugs.webkit.org/show_bug.cgi?id=196645
     5
     6        This change breaks build of WPE and GTK ports (Requested by
     7        annulen on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[CMake][WTF] Mirror XCode header directories"
     12        https://bugs.webkit.org/show_bug.cgi?id=191662
     13        https://trac.webkit.org/changeset/243833
     14
    1152019-04-03  Don Olmstead  <don.olmstead@sony.com>
    216

  • trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt

    r243833 r243934  
    6060target_link_libraries(WebKitQuartzCoreAdditions
    6161    D3d9
    62     WTFFramework
     62    WTF${DEBUG_SUFFIX}
    6363    CoreFoundation${DEBUG_SUFFIX}
    6464    CoreGraphics${DEBUG_SUFFIX}

  • trunk/Source/cmake/WebKitFS.cmake

    r243833 r243934  
    4040set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
    4141
    42 set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/FrameworkHeaders/WTF.framework/Headers)
    43 
    4442set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
    45 
    46 file(MAKE_DIRECTORY ${WTF_FRAMEWORK_HEADERS_DIR}/wtf)
    4743
    4844file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})

  • trunk/Tools/CMakeLists.txt

    r243833 r243934  
    11set_property(DIRECTORY . PROPERTY FOLDER "Tools")
    2 include(frameworks/WTF)
    32
    43# Individual subdirectories are added in the port's cmake file

  • trunk/Tools/ChangeLog

    r243927 r243934  
     12019-04-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r243833.
     4        https://bugs.webkit.org/show_bug.cgi?id=196645
     5
     6        This change breaks build of WPE and GTK ports (Requested by
     7        annulen on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[CMake][WTF] Mirror XCode header directories"
     12        https://bugs.webkit.org/show_bug.cgi?id=191662
     13        https://trac.webkit.org/changeset/243833
     14
    1152019-04-04  Simon Fraser  <simon.fraser@apple.com>
    216

  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r243833 r243934  
    6767set(TestNetscapePlugIn_LIBRARIES
    6868    JavaScriptCore
    69     WTFFramework
     69    WTF
    7070    WebCoreTestSupport
    7171)

  • trunk/Tools/DumpRenderTree/PlatformWin.cmake

    r243833 r243934  
    7171
    7272list(APPEND DumpRenderTree_LIBRARIES
    73     WTFFramework
     73    WTF
    7474    WebKitLegacy
    7575    shlwapi

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

    r243833 r243934  
    2525set(MiniBrowser_LIBRARIES
    2626    DbgHelp
    27     WTFFramework
     27    WTF
    2828    WebKitLegacy
    2929    WebKitLegacyGUID

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r243833 r243934  
    11set(TESTWEBKITAPI_DIR "${TOOLS_DIR}/TestWebKitAPI")
    2 
    32set(test_wtf_LIBRARIES
    4     WTFFramework
     3    WTF${DEBUG_SUFFIX}
    54    gtest
    65)
    76
    87set(test_webcore_LIBRARIES
    9     WTFFramework
     8    WTF${DEBUG_SUFFIX}
    109    WebCore${DEBUG_SUFFIX}
    1110    gtest
    … …  
    1312
    1413set(TestWebKitAPI_LIBRARIES
    15     WTFFramework
     14    WTF${DEBUG_SUFFIX}
    1615)
    1716
    … …  
    1918    JavaScriptCoreForwardingHeaders
    2019    JavaScriptCorePrivateForwardingHeaders
     20    WTFForwardingHeaders
    2121)
    2222
    … …  
    2929        JavaScriptCore
    3030        TestWebKitAPIBase
    31         WTFFramework
     31        WTF
    3232        WebKit
    3333        gtest
    … …  
    8989    set(TestWebKitAPIBase_LIBRARIES
    9090        JavaScriptCore
    91         WTFFramework
     91        WTF
    9292        WebKit
    9393        gtest
    … …  
    247247
    248248    target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
    249     add_dependencies(TestWebKitAPIInjectedBundle ${TestWebKitAPI_DEPENDENCIES})
     249    add_dependencies(TestWebKitAPIInjectedBundle WTF ${TestWebKitAPI_DEPENDENCIES})
    250250
    251251    if (COMPILER_IS_GCC_OR_CLANG)
    … …  
    272272    add_dependencies(TestWTF TestWTFLib)
    273273else ()
    274     add_dependencies(TestWTF ${TestWebKitAPI_DEPENDENCIES})
     274    add_dependencies(TestWTF WTF ${TestWebKitAPI_DEPENDENCIES})
    275275endif ()
    276276

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r243833 r243934  
    148148
    149149set(test_webkitlegacy_LIBRARIES
    150     WTFFramework
    151150    WebCoreTestSupport
    152151    WebKitLegacy${DEBUG_SUFFIX}

  • trunk/Tools/WebKitTestRunner/PlatformGTK.cmake

    r243833 r243934  
    3030    ${GTK3_LIBRARIES}
    3131    ${GLIB_LIBRARIES}
    32     WTFFramework
     32    WTF
    3333    WebCore
    3434    WebCorePlatformGTK

  • trunk/Tools/WebKitTestRunner/PlatformWin.cmake

    r243833 r243934  
    3737
    3838list(APPEND WebKitTestRunner_LIBRARIES
    39     WTFFramework
     39    WTF
    4040    WebKit
    4141)
Note: See TracChangeset for help on using the changeset viewer.