Unreviewed, rolling out r243833.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2019 15:35:32 +0000 (15:35 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2019 15:35:32 +0000 (15:35 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

29 files changed:
ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/shell/CMakeLists.txt
Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformWin.cmake
Source/WebDriver/CMakeLists.txt
Source/WebDriver/ChangeLog
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKitLegacy/CMakeLists.txt
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/PlatformWin.cmake
Source/WebKitLegacy/win/ChangeLog
Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt
Source/cmake/WebKitFS.cmake
Source/cmake/frameworks/WTF.cmake [deleted file]
Tools/CMakeLists.txt
Tools/ChangeLog
Tools/DumpRenderTree/CMakeLists.txt
Tools/DumpRenderTree/PlatformWin.cmake
Tools/MiniBrowser/win/CMakeLists.txt
Tools/TestWebKitAPI/CMakeLists.txt
Tools/TestWebKitAPI/PlatformWin.cmake
Tools/WebKitTestRunner/PlatformGTK.cmake
Tools/WebKitTestRunner/PlatformWin.cmake

index 2789abd..a9e982b 100644 (file)
--- 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
index 3395144..784e84a 100644 (file)
@@ -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
index 3d2396b..eef98aa 100644 (file)
@@ -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
index aaada69..aa7ce64 100644 (file)
@@ -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)
index aaea84b..bc7b7eb 100644 (file)
@@ -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
index 0391098..8c1583f 100644 (file)
@@ -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}
 )
 
index 3a62f7d..bd10389 100644 (file)
@@ -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")
 
index 328d4e3..e40d8fa 100644 (file)
@@ -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>
index 14126a5..5cc49ca 100644 (file)
@@ -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})
index 4c483d5..72ea2e2 100644 (file)
@@ -17,7 +17,7 @@ set(WebDriver_SOURCES
 )
 
 set(WebDriver_LIBRARIES
-    WTFFramework
+    WTF
 )
 
 set(WebDriver_SCRIPTS
index 085550e..e2b7002 100644 (file)
@@ -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
index 42e7603..c436113 100644 (file)
@@ -1,5 +1,4 @@
 include(WebKitCommon)
-include(frameworks/WTF)
 
 set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
 
index 3071993..6252d0a 100644 (file)
@@ -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
index dda807b..7fb8058 100644 (file)
@@ -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
index d7680c3..2bacde2 100644 (file)
@@ -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
index 0d29401..dc2d703 100644 (file)
@@ -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
index 394f9b6..6c94981 100644 (file)
@@ -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
index 535d8b4..ed8fac5 100644 (file)
@@ -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}
index 0a7414e..9ddc981 100644 (file)
@@ -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 (file)
index c0ef77b..0000000
+++ /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 ()
index 516649c..5d32367 100644 (file)
@@ -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()
index 015a7ed..4287762 100644 (file)
@@ -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
index ff91f12..bb46f24 100644 (file)
@@ -66,7 +66,7 @@ set(TestNetscapePlugIn_SOURCES
 
 set(TestNetscapePlugIn_LIBRARIES
     JavaScriptCore
-    WTFFramework
+    WTF
     WebCoreTestSupport
 )
 
index e81be4a..5c5c3f9 100644 (file)
@@ -70,7 +70,7 @@ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
 )
 
 list(APPEND DumpRenderTree_LIBRARIES
-    WTFFramework
+    WTF
     WebKitLegacy
     shlwapi
 )
index a43cd69..7fa2f3e 100644 (file)
@@ -24,7 +24,7 @@ set(MiniBrowser_SOURCES
 
 set(MiniBrowser_LIBRARIES
     DbgHelp
-    WTFFramework
+    WTF
     WebKitLegacy
     WebKitLegacyGUID
     comctl32
index 9953060..4509208 100644 (file)
@@ -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})
index 47c5131..b49c92e 100644 (file)
@@ -147,7 +147,6 @@ if (${WTF_PLATFORM_WIN_CAIRO})
 endif ()
 
 set(test_webkitlegacy_LIBRARIES
-    WTFFramework
     WebCoreTestSupport
     WebKitLegacy${DEBUG_SUFFIX}
     gtest
index 3094a5b..b0af11e 100644 (file)
@@ -29,7 +29,7 @@ list(APPEND WebKitTestRunner_LIBRARIES
     ${CAIRO_LIBRARIES}
     ${GTK3_LIBRARIES}
     ${GLIB_LIBRARIES}
-    WTFFramework
+    WTF
     WebCore
     WebCorePlatformGTK
 )
index fecfd82..f244cd6 100644 (file)
@@ -36,7 +36,7 @@ set(WebKitTestRunnerLib_LIBRARIES
 )
 
 list(APPEND WebKitTestRunner_LIBRARIES
-    WTFFramework
+    WTF
     WebKit
 )