Attachment 371100 Details for Bug 198403 – Patch

[patch] Patch

bug-198403.diff (text/plain), 13.30 KB, created by Don Olmstead on 2019-05-31 18:34:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-05-31 18:34:03 PDT

Size: 13.30 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index 9415ea07154..9c9747408f9 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -290,9 +290,9 @@ add_executable(LLIntOffsetsExtractor
> )
> 
> target_link_libraries(LLIntSettingsExtractor WebKit::WTF)
>-add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders)
>+add_dependencies(LLIntSettingsExtractor JavaScriptCore_CopyHeaders)
> target_link_libraries(LLIntOffsetsExtractor WebKit::WTF)
>-add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders)
>+add_dependencies(LLIntOffsetsExtractor JavaScriptCore_CopyHeaders)
> 
> # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
> # LLIntAssembly.h's mtime. The problem we have here is: asm.rb has some built-in optimization
>@@ -1262,6 +1262,16 @@ if (WTF_CPU_X86_64)
>     endif ()
> endif ()
> 
>+set(JavaScriptCore_INTERFACE_LIBRARIES JavaScriptCore)
>+set(JavaScriptCore_INTERFACE_INCLUDE_DIRECTORIES
>+    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
>+    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>+)
>+set(JavaScriptCore_INTERFACE_DEPENDENCIES
>+    JavaScriptCore_CopyHeaders
>+    JavaScriptCore_CopyPrivateHeaders
>+)
>+
> WEBKIT_FRAMEWORK_DECLARE(JavaScriptCore)
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>@@ -1271,15 +1281,13 @@ if (COMPILER_IS_GCC_OR_CLANG)
>     WEBKIT_ADD_TARGET_CXX_FLAGS(JavaScriptCore -ffp-contract=off)
> endif ()
> 
>-WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
>-    TARGET_NAME JavaScriptCoreFrameworkHeaders
>+WEBKIT_COPY_FILES(JavaScriptCore_CopyHeaders
>     DESTINATION ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
>     FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
>     FLATTENED
> )
> 
>-WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
>-    TARGET_NAME JavaScriptCorePrivateFrameworkHeaders
>+WEBKIT_COPY_FILES(JavaScriptCore_CopyPrivateHeaders
>     DESTINATION ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
>     FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
>     FLATTENED
>@@ -1302,6 +1310,7 @@ add_subdirectory(shell)
> WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
> WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
> WEBKIT_FRAMEWORK(JavaScriptCore)
>+WEBKIT_FRAMEWORK_TARGET(JavaScriptCore)
> 
> if (NOT "${PORT}" STREQUAL "Mac")
>     if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 2a775655d2c..1f01b2b7ccb 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add WebKit::JavaScriptCore target
>+        https://bugs.webkit.org/show_bug.cgi?id=198403
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Create the WebKit::JavaScriptCore target and use that to propagate headers. Use
>+        WEBKIT_COPY_FILES instead of WEBKIT_MAKE_FORWARDING_HEADERS.
>+
>+        * CMakeLists.txt:
>+        * shell/CMakeLists.txt:
>+
> 2019-05-31  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WebKit::WTF target
>diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
>index 7acfa89031e..9a49a33e73e 100644
>--- a/Source/JavaScriptCore/shell/CMakeLists.txt
>+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
>@@ -8,13 +8,12 @@ endif ()
> 
> set(jsc_LIBRARIES
>     ${CMAKE_DL_LIBS}
>-    JavaScriptCore
>+    WebKit::JavaScriptCore
> )
> 
> set(jsc_PRIVATE_INCLUDE_DIRECTORIES
>     ${JavaScriptCore_INCLUDE_DIRECTORIES}
>     ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}
>-    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}
> )
> 
>@@ -41,32 +40,32 @@ if (DEVELOPER_MODE)
>     )
>     set(testapi_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
>     set(testapi_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
>-    set(testapi_LIBRARIES JavaScriptCore)
>+    set(testapi_LIBRARIES WebKit::JavaScriptCore)
> 
>     set(testmasm_SOURCES ../assembler/testmasm.cpp)
>     set(testmasm_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
>     set(testmasm_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
>-    set(testmasm_LIBRARIES JavaScriptCore)
>+    set(testmasm_LIBRARIES WebKit::JavaScriptCore)
> 
>     set(testRegExp_SOURCES ../testRegExp.cpp)
>     set(testRegExp_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
>     set(testRegExp_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
>-    set(testRegExp_LIBRARIES JavaScriptCore)
>+    set(testRegExp_LIBRARIES WebKit::JavaScriptCore)
> 
>     set(testb3_SOURCES ../b3/testb3.cpp)
>     set(testb3_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
>     set(testb3_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
>-    set(testb3_LIBRARIES JavaScriptCore)
>+    set(testb3_LIBRARIES WebKit::JavaScriptCore)
> 
>     set(testair_SOURCES ../b3/air/testair.cpp)
>     set(testair_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
>     set(testair_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
>-    set(testair_LIBRARIES JavaScriptCore)
>+    set(testair_LIBRARIES WebKit::JavaScriptCore)
> 
>     set(testdfg_SOURCES ../dfg/testdfg.cpp)
>     set(testdfg_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
>     set(testdfg_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
>-    set(testdfg_LIBRARIES JavaScriptCore)
>+    set(testdfg_LIBRARIES WebKit::JavaScriptCore)
> 
>     WEBKIT_EXECUTABLE_DECLARE(testapi)
>     WEBKIT_EXECUTABLE_DECLARE(testRegExp)
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index 0b0fdf816eb..071ad2027ec 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -17,7 +17,6 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
> )
> 
> set(WebCore_INCLUDE_DIRECTORIES
>-    "${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
>     "${PAL_FRAMEWORK_HEADERS_DIR}"
> )
> 
>@@ -1204,7 +1203,7 @@ set(WebCore_LIBRARIES
> )
> 
> set(WebCoreTestSupport_LIBRARIES
>-    JavaScriptCore${DEBUG_SUFFIX}
>+    WebKit::JavaScriptCore
> )
> 
> if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f7c24b59508..2ada0a86a94 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add WebKit::JavaScriptCore target
>+        https://bugs.webkit.org/show_bug.cgi?id=198403
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use the WebKit::JavaScriptCore target.
>+
>+        * CMakeLists.txt:
>+
> 2019-05-31  Andres Gonzalez  <andresg_22@apple.com>
> 
>         Inserting a newline in contenteditable causes two characters to be added instead of one
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index e4a59749145..8220da09541 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add WebKit::JavaScriptCore target
>+        https://bugs.webkit.org/show_bug.cgi?id=198403
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use the WebKit::JavaScriptCore target.
>+
>+        * pal/CMakeLists.txt:
>+
> 2019-05-29  Don Olmstead  <don.olmstead@sony.com>
> 
>         Remove ENABLE definitions from WebKit config files
>diff --git a/Source/WebCore/PAL/pal/CMakeLists.txt b/Source/WebCore/PAL/pal/CMakeLists.txt
>index fc0091e32fa..1d072330d9c 100644
>--- a/Source/WebCore/PAL/pal/CMakeLists.txt
>+++ b/Source/WebCore/PAL/pal/CMakeLists.txt
>@@ -38,7 +38,7 @@ set(PAL_PRIVATE_INCLUDE_DIRECTORIES
> )
> 
> set(PAL_LIBRARIES
>-    JavaScriptCore${DEBUG_SUFFIX}
>+    WebKit::JavaScriptCore
> )
> 
> WEBKIT_FRAMEWORK_DECLARE(PAL)
>diff --git a/Source/WebKitLegacy/CMakeLists.txt b/Source/WebKitLegacy/CMakeLists.txt
>index 960a970ebb0..82681807dba 100644
>--- a/Source/WebKitLegacy/CMakeLists.txt
>+++ b/Source/WebKitLegacy/CMakeLists.txt
>@@ -26,7 +26,7 @@ set(WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
> )
> 
> set(WebKitLegacy_LIBRARIES
>-    PRIVATE JavaScriptCore${DEBUG_SUFFIX}
>+    PRIVATE WebKit::JavaScriptCore
>     PRIVATE WebCore${DEBUG_SUFFIX}
>     PRIVATE PAL${DEBUG_SUFFIX}
> )
>diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
>index 600ee0ce9ac..cc781fb81aa 100644
>--- a/Source/WebKitLegacy/ChangeLog
>+++ b/Source/WebKitLegacy/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add WebKit::JavaScriptCore target
>+        https://bugs.webkit.org/show_bug.cgi?id=198403
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use the WebKit::JavaScriptCore target.
>+
>+        * CMakeLists.txt:
>+
> 2019-05-31  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WebKit::WTF target
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 4fb5269a595..2b34ec10b79 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-05-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add WebKit::JavaScriptCore target
>+        https://bugs.webkit.org/show_bug.cgi?id=198403
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use the WebKit::JavaScriptCore target.
>+
>+        * DumpRenderTree/CMakeLists.txt:
>+        * MiniBrowser/win/CMakeLists.txt:
>+        * TestWebKitAPI/CMakeLists.txt:
>+        * TestWebKitAPI/PlatformGTK.cmake:
>+        * TestWebKitAPI/PlatformWPE.cmake:
>+        * TestWebKitAPI/glib/CMakeLists.txt:
>+        * WebKitTestRunner/CMakeLists.txt:
>+
> 2019-05-31  Alex Christensen  <achristensen@webkit.org>
> 
>         URLParser::parseIPv6Host should properly parse 0's around compression
>diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt
>index d61cbf43e61..f579f4ee0f2 100644
>--- a/Tools/DumpRenderTree/CMakeLists.txt
>+++ b/Tools/DumpRenderTree/CMakeLists.txt
>@@ -23,7 +23,7 @@ set(DumpRenderTree_SOURCES
> 
> set(DumpRenderTree_LIBRARIES
>     WebCoreTestSupport
>-    JavaScriptCore
>+    WebKit::JavaScriptCore
> )
> 
> set(DumpRenderTree_INCLUDE_DIRECTORIES
>@@ -67,7 +67,7 @@ set(TestNetscapePlugIn_SOURCES
> )
> 
> set(TestNetscapePlugIn_LIBRARIES
>-    JavaScriptCore
>+    WebKit::JavaScriptCore
>     WebCoreTestSupport
> )
> 
>diff --git a/Tools/MiniBrowser/win/CMakeLists.txt b/Tools/MiniBrowser/win/CMakeLists.txt
>index 30b73dfba98..b4d5402699c 100644
>--- a/Tools/MiniBrowser/win/CMakeLists.txt
>+++ b/Tools/MiniBrowser/win/CMakeLists.txt
>@@ -1,6 +1,4 @@
> set(MiniBrowser_INCLUDE_DIRECTORIES
>-    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
>-    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     ${PAL_FRAMEWORK_HEADERS_DIR}
>     ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
>diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt
>index bdaca4972d4..c49d97aedc3 100644
>--- a/Tools/TestWebKitAPI/CMakeLists.txt
>+++ b/Tools/TestWebKitAPI/CMakeLists.txt
>@@ -245,8 +245,6 @@ if (ENABLE_WEBKIT)
>         ${TESTWEBKITAPI_DIR}
>         ${THIRDPARTY_DIR}/gtest/include
>         ${PAL_FRAMEWORK_HEADERS_DIR}
>-        ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>-        ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
>         ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>         ${WebKit_FRAMEWORK_HEADERS_DIR}
>     )
>diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
>index 821f3637b4f..ba90917cb50 100644
>--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
>+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
>@@ -105,7 +105,6 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
>     ${GLIB_INCLUDE_DIRS}
>     ${GTK3_INCLUDE_DIRS}
>     ${THIRDPARTY_DIR}/gtest/include
>-    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     ${FORWARDING_HEADERS_DIR}
>     ${FORWARDING_HEADERS_DIR}/JavaScriptCore
>     ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib
>@@ -115,7 +114,7 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
> set(TestJSC_LIBRARIES
>     ${GLIB_LIBRARIES}
>     ${GLIB_GMODULE_LIBRARIES}
>-    JavaScriptCore
>+    WebKit::JavaScriptCore
> )
> 
> set(TestJSC_DEFINITIONS
>diff --git a/Tools/TestWebKitAPI/PlatformWPE.cmake b/Tools/TestWebKitAPI/PlatformWPE.cmake
>index 7c676ba5602..54413ef2adf 100644
>--- a/Tools/TestWebKitAPI/PlatformWPE.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWPE.cmake
>@@ -100,7 +100,6 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
>     ${CMAKE_BINARY_DIR}
>     ${TESTWEBKITAPI_DIR}
>     ${THIRDPARTY_DIR}/gtest/include
>-    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     ${FORWARDING_HEADERS_DIR}
>     ${FORWARDING_HEADERS_DIR}/JavaScriptCore
>     ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib
>@@ -110,7 +109,7 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
> set(TestJSC_LIBRARIES
>     ${GLIB_LIBRARIES}
>     ${GLIB_GMODULE_LIBRARIES}
>-    JavaScriptCore
>+    WebKit::JavaScriptCore
> )
> 
> set(TestJSC_DEFINITIONS
>diff --git a/Tools/TestWebKitAPI/glib/CMakeLists.txt b/Tools/TestWebKitAPI/glib/CMakeLists.txt
>index 2a743a71893..6f1d5a09378 100644
>--- a/Tools/TestWebKitAPI/glib/CMakeLists.txt
>+++ b/Tools/TestWebKitAPI/glib/CMakeLists.txt
>@@ -22,7 +22,7 @@ set(WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
> )
> 
> set(WebKitAPITest_LIBRARIES
>-    JavaScriptCore
>+    WebKit::JavaScriptCore
>     WebKit
> )
> 
>@@ -34,7 +34,7 @@ set(WebKitGLibAPITest_LIBRARIES
> )
> 
> set(WebKitGLibAPITestExtension_LIBRARIES
>-    JavaScriptCore
>+    WebKit::JavaScriptCore
>     WebKit
>     ${GLIB_LIBRARIES}
> )
>diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
>index 632aa0b0675..b2335b25b4b 100644
>--- a/Tools/WebKitTestRunner/CMakeLists.txt
>+++ b/Tools/WebKitTestRunner/CMakeLists.txt
>@@ -23,7 +23,7 @@ set(WebKitTestRunner_SOURCES
> )
> 
> set(WebKitTestRunner_LIBRARIES
>-    JavaScriptCore
>+    WebKit::JavaScriptCore
>     WebCoreTestSupport
>     WebKit
> )

Actions: View | Formatted Diff | Diff

Attachments on bug 198403: 371086 | 371100