Attachment 366814 Details for Bug 196645 – ROLLOUT of r243833

[patch] ROLLOUT of r243833

bug-196645-20190405081840.patch (text/plain), 19.49 KB, created by WebKit Commit Bot on 2019-04-05 08:18:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-04-05 08:18:40 PDT

Size: 19.49 KB

patch

obsolete

>Subversion Revision: 243933
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 3d2396bce7aa1d6b325569f5127ae9df1c7c79e5..eef98aa114150b102ec245d579868c7ed4e7652c 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-05  Commit Queue  <commit-queue@webkit.org>
>+
>+        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
>+
> 2019-04-05  Caitlin Potter  <caitp@igalia.com>
> 
>         [JSC] throw if ownKeys Proxy trap result contains duplicate keys
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index aaea84b87cf76ed6bb43f42de9675c6494f214da..bc7b7eb2adefcce90a45f22949e025d66585c7e7 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-05  Commit Queue  <commit-queue@webkit.org>
>+
>+        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
>+
> 2019-04-05  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Make WeakPtr<Element> possible and deploy it in form associated elements code
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 328d4e388d014ae4506cc0d914b07e77c146bf38..e40d8fada4bc6f1bc209461bbdd02e9311ac119f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-05  Commit Queue  <commit-queue@webkit.org>
>+
>+        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
>+
> 2019-04-05  David Kilzer  <ddkilzer@apple.com>
> 
>         REGRESSION(r243887): Try to fix Windows builds by including <wtf/IsoMalloc.h>
>diff --git a/Source/WebDriver/ChangeLog b/Source/WebDriver/ChangeLog
>index 085550e2e60f2ac7aa380e45f689d682025b9398..e2b7002a614d46961362a48fd771ef594126c2e4 100644
>--- a/Source/WebDriver/ChangeLog
>+++ b/Source/WebDriver/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-05  Commit Queue  <commit-queue@webkit.org>
>+
>+        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
>+
> 2019-04-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake][WTF] Mirror XCode header directories
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 30719933d3ec5f6a623c67766c9c1f6160d0f9cd..6252d0a81cc56c3a025edbb63dddd029ab442ad4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-05  Commit Queue  <commit-queue@webkit.org>
>+
>+        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
>+
> 2019-04-05  David Kilzer  <ddkilzer@apple.com>
> 
>         REGRESSION(r240685): Remove duplicate Headers entry for _WKInspectorWindow.h in Xcode project
>diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
>index d7680c33eac198db1a1c79a5a5f74327d669c2b5..2bacde27f471be69e7fc62fe9d80c9b25e482bfd 100644
>--- a/Source/WebKitLegacy/ChangeLog
>+++ b/Source/WebKitLegacy/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-05  Commit Queue  <commit-queue@webkit.org>
>+
>+        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
>+
> 2019-04-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake][WTF] Mirror XCode header directories
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index 394f9b63d9a5402c6077ab2a9c40ca259e4b13ac..6c94981a7232f1e1c474444384ab50d64a409078 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-05  Commit Queue  <commit-queue@webkit.org>
>+
>+        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
>+
> 2019-04-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake][WTF] Mirror XCode header directories
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index 339514439e7470e3be0a20f548854b50c72d313a..784e84a8c2cb60c39a5aca96f0d66d3d7fe19e3a 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -1,6 +1,5 @@
> cmake_minimum_required(VERSION 2.8.12)
> include(WebKitCommon)
>-include(frameworks/WTF)
> set_property(DIRECTORY . PROPERTY FOLDER "JavaScriptCore")
> 
> list(APPEND JavaScriptCore_UNIFIED_SOURCE_LIST_FILES
>@@ -120,7 +119,7 @@ set(JavaScriptCore_OBJECT_LUT_SOURCES
> )
> 
> set(JavaScriptCore_LIBRARIES
>-    WTFFramework
>+    WTF${DEBUG_SUFFIX}
>     ${ICU_I18N_LIBRARIES}
> )
> 
>@@ -300,9 +299,9 @@ add_executable(LLIntOffsetsExtractor
>     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeStructs.h
> )
> 
>-target_link_libraries(LLIntSettingsExtractor WTFFramework)
>+target_link_libraries(LLIntSettingsExtractor WTF)
> add_dependencies(LLIntSettingsExtractor JavaScriptCoreForwardingHeaders)
>-target_link_libraries(LLIntOffsetsExtractor WTFFramework)
>+target_link_libraries(LLIntOffsetsExtractor WTF)
> add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
> 
> # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
>diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
>index aaada6980907207c4c483a7a34039fc86eb80506..aa7ce64ec1c75397355e25f49b159ae1ebd49faa 100644
>--- a/Source/JavaScriptCore/shell/CMakeLists.txt
>+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
>@@ -5,7 +5,7 @@ set(JSC_SOURCES
> set(JSC_LIBRARIES
>     ${CMAKE_DL_LIBS}
>     JavaScriptCore${DEBUG_SUFFIX}
>-    WTFFramework
>+    WTF${DEBUG_SUFFIX}
> )
> 
> if (WTF_OS_MAC_OS_X)
>diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
>index 0391098e56b152c695f19f5ff913df68fc75785a..8c1583f650176cea53d51d2527abe9008c6fea5e 100644
>--- a/Source/WTF/wtf/CMakeLists.txt
>+++ b/Source/WTF/wtf/CMakeLists.txt
>@@ -502,8 +502,7 @@ WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
> WEBKIT_FRAMEWORK(WTF)
> 
> WEBKIT_MAKE_FORWARDING_HEADERS(WTF
>-    TARGET_NAME WTFFrameworkHeaders
>-    DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
>+    DESTINATION ${FORWARDING_HEADERS_DIR}/wtf
>     FILES ${WTF_PUBLIC_HEADERS}
> )
> 
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index 3a62f7d58d69972b7a39acda45f557be321ae8c2..bd10389f33e310e9e24e02905e48ca2f1ff91a2e 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.8.12)
> 
> include(WebKitCommon)
> include(WebCoreMacros.cmake)
>-include(frameworks/WTF)
> 
> set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
> 
>diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
>index 14126a5cf53c37bccb3b8a1b1c1865b6013b759b..5cc49ca4022f71f35cf1803418ad412e825bb67c 100644
>--- a/Source/WebCore/PlatformWin.cmake
>+++ b/Source/WebCore/PlatformWin.cmake
>@@ -365,8 +365,8 @@ set(WebCore_OUTPUT_NAME
>     WebCore${DEBUG_SUFFIX}
> )
> 
>-list(APPEND WebCore_LIBRARIES WTFFramework)
>+list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
> if (TARGET libEGL)
>     list(APPEND WebCore_LIBRARIES libEGL)
> endif ()
>-list(APPEND WebCoreTestSupport_LIBRARIES WTFFramework)
>+list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})
>diff --git a/Source/WebDriver/CMakeLists.txt b/Source/WebDriver/CMakeLists.txt
>index 4c483d5ceccd9d339e7c86b47f72807bed61f218..72ea2e2de4dc241eea8fac123a038fc4a67a27f4 100644
>--- a/Source/WebDriver/CMakeLists.txt
>+++ b/Source/WebDriver/CMakeLists.txt
>@@ -17,7 +17,7 @@ set(WebDriver_SOURCES
> )
> 
> set(WebDriver_LIBRARIES
>-    WTFFramework
>+    WTF
> )
> 
> set(WebDriver_SCRIPTS
>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index 42e7603f10e964f994e140ed00a4e8bac5039be8..c43611342cb63014223b84c6dbf9b8e11d31c603 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -1,5 +1,4 @@
> include(WebKitCommon)
>-include(frameworks/WTF)
> 
> set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
> 
>diff --git a/Source/WebKitLegacy/CMakeLists.txt b/Source/WebKitLegacy/CMakeLists.txt
>index dda807b4159fb8d7688430cb176350d6ffee652a..7fb8058cb6f140e7b8ec38049bfb70f8645be9ec 100644
>--- a/Source/WebKitLegacy/CMakeLists.txt
>+++ b/Source/WebKitLegacy/CMakeLists.txt
>@@ -1,6 +1,5 @@
> cmake_minimum_required(VERSION 2.8.12)
> include(WebKitCommon)
>-include(frameworks/WTF)
> set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy")
> 
> set(WebKitLegacy_SOURCES
>diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake
>index 0d29401c51191a2250829762e491c950088fb806..dc2d703cc2b60999cac4c3875b25142a93bb13e5 100644
>--- a/Source/WebKitLegacy/PlatformWin.cmake
>+++ b/Source/WebKitLegacy/PlatformWin.cmake
>@@ -34,7 +34,7 @@ else ()
>     )
> endif ()
> 
>-list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTFFramework)
>+list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
> 
> add_custom_command(
>     OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h
>diff --git a/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt b/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt
>index 535d8b47edc9ac95a9f539c0b944065849045895..ed8fac5212e94c67018d0dc03bc7e8e7a6ee9266 100644
>--- a/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt
>+++ b/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt
>@@ -59,7 +59,7 @@ add_library(WebKitQuartzCoreAdditions SHARED ${WebKitQuartzCoreAdditions_SOURCES
> set_target_properties(WebKitQuartzCoreAdditions PROPERTIES OUTPUT_NAME WebKitQuartzCoreAdditions${DEBUG_SUFFIX})
> target_link_libraries(WebKitQuartzCoreAdditions
>     D3d9
>-    WTFFramework
>+    WTF${DEBUG_SUFFIX}
>     CoreFoundation${DEBUG_SUFFIX}
>     CoreGraphics${DEBUG_SUFFIX}
>     QuartzCore${DEBUG_SUFFIX}
>diff --git a/Source/cmake/WebKitFS.cmake b/Source/cmake/WebKitFS.cmake
>index 0a7414e0ca51a4fa37450cf7547b879a8e869f55..9ddc981489a99d03fd37cf6604119275636efc6a 100644
>--- a/Source/cmake/WebKitFS.cmake
>+++ b/Source/cmake/WebKitFS.cmake
>@@ -39,12 +39,8 @@ set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
> set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
> set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
> 
>-set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/FrameworkHeaders/WTF.framework/Headers)
>-
> set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
> 
>-file(MAKE_DIRECTORY ${WTF_FRAMEWORK_HEADERS_DIR}/wtf)
>-
> file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
> file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
> 
>diff --git a/Source/cmake/frameworks/WTF.cmake b/Source/cmake/frameworks/WTF.cmake
>deleted file mode 100644
>index c0ef77bfc9242f049105006ebde4c348cbf717d1..0000000000000000000000000000000000000000
>--- a/Source/cmake/frameworks/WTF.cmake
>+++ /dev/null
>@@ -1,15 +0,0 @@
>-if (NOT TARGET WTFFramework)
>-    add_library(WTFFramework INTERFACE)
>-
>-    if (WIN32 AND INTERNAL_BUILD)
>-        target_link_libraries(WTFFramework INTERFACE WTF${DEBUG_SUFFIX})
>-    else ()
>-        target_include_directories(WTFFramework INTERFACE
>-            ${WTF_INCLUDE_DIRECTORIES}
>-            ${WTF_FRAMEWORK_HEADERS_DIR}
>-        )
>-        target_include_directories(WTFFramework SYSTEM INTERFACE ${WTF_SYSTEM_INCLUDE_DIRECTORIES})
>-        target_link_libraries(WTFFramework INTERFACE WTF ${WTF_LIBRARIES})
>-        add_dependencies(WTFFramework WTFFrameworkHeaders)
>-    endif ()
>-endif ()
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 015a7ed6a77534538a5c0a71ae7240daf98f2e82..4287762d91c40d208f2deeaa53debd3ffd180a41 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-05  Commit Queue  <commit-queue@webkit.org>
>+
>+        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
>+
> 2019-04-04  Simon Fraser  <simon.fraser@apple.com>
> 
>         Simple iframe scrolling test fails to get a composited scrolling frame in WebKitTestRunnerApp
>diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
>index 516649cadff5a7d77532b16683582a2ba4d29475..5d3236733a96dfc2df1ea5681db03f2c12c40349 100644
>--- a/Tools/CMakeLists.txt
>+++ b/Tools/CMakeLists.txt
>@@ -1,5 +1,4 @@
> set_property(DIRECTORY . PROPERTY FOLDER "Tools")
>-include(frameworks/WTF)
> 
> # Individual subdirectories are added in the port's cmake file
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
>diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt
>index ff91f12211a51f05146a25b4a0a6f592e8d42bdf..bb46f24b742410ed3c53bc4f2d6d7895c7000206 100644
>--- a/Tools/DumpRenderTree/CMakeLists.txt
>+++ b/Tools/DumpRenderTree/CMakeLists.txt
>@@ -66,7 +66,7 @@ set(TestNetscapePlugIn_SOURCES
> 
> set(TestNetscapePlugIn_LIBRARIES
>     JavaScriptCore
>-    WTFFramework
>+    WTF
>     WebCoreTestSupport
> )
> 
>diff --git a/Tools/DumpRenderTree/PlatformWin.cmake b/Tools/DumpRenderTree/PlatformWin.cmake
>index e81be4a39a0f07d08b775ff1d783561e74a01c6c..5c5c3f981b9a3bcfea90357bfaf152b91b5021eb 100644
>--- a/Tools/DumpRenderTree/PlatformWin.cmake
>+++ b/Tools/DumpRenderTree/PlatformWin.cmake
>@@ -70,7 +70,7 @@ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
> )
> 
> list(APPEND DumpRenderTree_LIBRARIES
>-    WTFFramework
>+    WTF
>     WebKitLegacy
>     shlwapi
> )
>diff --git a/Tools/MiniBrowser/win/CMakeLists.txt b/Tools/MiniBrowser/win/CMakeLists.txt
>index a43cd6931ae4d87988f056a025c2f2e2296dfcad..7fa2f3e342c0d3fb2d7118ae02b54921b1520a5e 100644
>--- a/Tools/MiniBrowser/win/CMakeLists.txt
>+++ b/Tools/MiniBrowser/win/CMakeLists.txt
>@@ -24,7 +24,7 @@ set(MiniBrowser_SOURCES
> 
> set(MiniBrowser_LIBRARIES
>     DbgHelp
>-    WTFFramework
>+    WTF
>     WebKitLegacy
>     WebKitLegacyGUID
>     comctl32
>diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt
>index 9953060d642a2b56c6369cb278806a09a3d1c25e..4509208fe57c863d4ce58cc4d69d71bacf023e41 100644
>--- a/Tools/TestWebKitAPI/CMakeLists.txt
>+++ b/Tools/TestWebKitAPI/CMakeLists.txt
>@@ -1,23 +1,23 @@
> set(TESTWEBKITAPI_DIR "${TOOLS_DIR}/TestWebKitAPI")
>-
> set(test_wtf_LIBRARIES
>-    WTFFramework
>+    WTF${DEBUG_SUFFIX}
>     gtest
> )
> 
> set(test_webcore_LIBRARIES
>-    WTFFramework
>+    WTF${DEBUG_SUFFIX}
>     WebCore${DEBUG_SUFFIX}
>     gtest
> )
> 
> set(TestWebKitAPI_LIBRARIES
>-    WTFFramework
>+    WTF${DEBUG_SUFFIX}
> )
> 
> set(TestWebKitAPI_DEPENDENCIES
>     JavaScriptCoreForwardingHeaders
>     JavaScriptCorePrivateForwardingHeaders
>+    WTFForwardingHeaders
> )
> 
> if (ENABLE_WEBCORE)
>@@ -28,7 +28,7 @@ if (ENABLE_WEBKIT)
>     set(test_webkit_api_LIBRARIES
>         JavaScriptCore
>         TestWebKitAPIBase
>-        WTFFramework
>+        WTF
>         WebKit
>         gtest
>     )
>@@ -88,7 +88,7 @@ if (ENABLE_WEBKIT)
> 
>     set(TestWebKitAPIBase_LIBRARIES
>         JavaScriptCore
>-        WTFFramework
>+        WTF
>         WebKit
>         gtest
>     )
>@@ -246,7 +246,7 @@ if (ENABLE_WEBKIT)
>     )
> 
>     target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
>-    add_dependencies(TestWebKitAPIInjectedBundle ${TestWebKitAPI_DEPENDENCIES})
>+    add_dependencies(TestWebKitAPIInjectedBundle WTF ${TestWebKitAPI_DEPENDENCIES})
> 
>     if (COMPILER_IS_GCC_OR_CLANG)
>         WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKitAPIInjectedBundle -Wno-dangling-else
>@@ -271,7 +271,7 @@ add_executable(TestWTF
> if (WIN32)
>     add_dependencies(TestWTF TestWTFLib)
> else ()
>-    add_dependencies(TestWTF ${TestWebKitAPI_DEPENDENCIES})
>+    add_dependencies(TestWTF WTF ${TestWebKitAPI_DEPENDENCIES})
> endif ()
> 
> target_link_libraries(TestWTF ${test_wtf_LIBRARIES})
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index 47c5131c8728ede332e3f8ec42c54ed14204ef07..b49c92effb3234c0e067935f48dcb8d78526f695 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -147,7 +147,6 @@ if (${WTF_PLATFORM_WIN_CAIRO})
> endif ()
> 
> set(test_webkitlegacy_LIBRARIES
>-    WTFFramework
>     WebCoreTestSupport
>     WebKitLegacy${DEBUG_SUFFIX}
>     gtest
>diff --git a/Tools/WebKitTestRunner/PlatformGTK.cmake b/Tools/WebKitTestRunner/PlatformGTK.cmake
>index 3094a5b763b8626f132ae6ecf7221fb6d399bbc5..b0af11ee02665fd99b445f80358393d19fc97852 100644
>--- a/Tools/WebKitTestRunner/PlatformGTK.cmake
>+++ b/Tools/WebKitTestRunner/PlatformGTK.cmake
>@@ -29,7 +29,7 @@ list(APPEND WebKitTestRunner_LIBRARIES
>     ${CAIRO_LIBRARIES}
>     ${GTK3_LIBRARIES}
>     ${GLIB_LIBRARIES}
>-    WTFFramework
>+    WTF
>     WebCore
>     WebCorePlatformGTK
> )
>diff --git a/Tools/WebKitTestRunner/PlatformWin.cmake b/Tools/WebKitTestRunner/PlatformWin.cmake
>index fecfd824fb0daea108f3bb3bc264c6bdeef38427..f244cd6be5a31a28a46f7e4fa3da90d82632e14b 100644
>--- a/Tools/WebKitTestRunner/PlatformWin.cmake
>+++ b/Tools/WebKitTestRunner/PlatformWin.cmake
>@@ -36,7 +36,7 @@ set(WebKitTestRunnerLib_LIBRARIES
> )
> 
> list(APPEND WebKitTestRunner_LIBRARIES
>-    WTFFramework
>+    WTF
>     WebKit
> )
> 
>diff --git a/ChangeLog b/ChangeLog
>index 2789abd0d992963f48083f4c073e18c4e060af9c..a9e982b8a2c04f1a82b057b960067f53b2895aff 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-05  Commit Queue  <commit-queue@webkit.org>
>+
>+        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
>+
> 2019-04-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake][WTF] Mirror XCode header directories

Actions: View | Formatted Diff | Diff

Attachments on bug 196645: 366814