Attachment 368743 Details for Bug 197174 – Patch

[patch] Patch

bug-197174.diff (text/plain), 14.42 KB, created by Don Olmstead on 2019-05-01 18:15:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-05-01 18:15:12 PDT

Size: 14.42 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index eb2d7340037..c93c7b980f4 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-05-01  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
>+        https://bugs.webkit.org/show_bug.cgi?id=197174
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace WEBKIT_MAKE_FORWARDING_HEADERS with WEBKIT_COPY_FILES which is a general
>+        purpose macro that copies files to a destination. WEBKIT_COPY_FILES removes the
>+        requirement of a target being passed in so there is no longer any implicit dependency
>+        between the target and the copying. Instead the dependencies need to be explicit.
>+
>+        This opens the macro up for use by third party libraries and for copying other files
>+        to a destination.
>+
>+        * Source/cmake/WebKitMacros.cmake:
>+
> 2019-04-30  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK] Support prefers-color-scheme media query
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index a12c0748d60..86a73f8ac00 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -296,9 +296,9 @@ add_executable(LLIntOffsetsExtractor
> )
> 
> target_link_libraries(LLIntSettingsExtractor WTF)
>-add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders)
>+add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders WTFFrameworkHeaders)
> target_link_libraries(LLIntOffsetsExtractor WTF)
>-add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders)
>+add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders WTFFrameworkHeaders)
> 
> # 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
>@@ -1274,20 +1274,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
>     WEBKIT_ADD_TARGET_CXX_FLAGS(JavaScriptCore -ffp-contract=off)
> endif ()
> 
>-WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
>-    TARGET_NAME JavaScriptCoreFrameworkHeaders
>-    DESTINATION ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
>-    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
>-    FLATTENED
>-)
>-
>-WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
>-    TARGET_NAME JavaScriptCorePrivateFrameworkHeaders
>-    DESTINATION ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
>-    FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
>-    FLATTENED
>-)
>-
> target_include_directories(LLIntSettingsExtractor PRIVATE
>     ${JavaScriptCore_INCLUDE_DIRECTORIES}
>     ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}
>@@ -1306,6 +1292,21 @@ WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
> WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
> WEBKIT_FRAMEWORK(JavaScriptCore)
> 
>+WEBKIT_COPY_FILES(JavaScriptCoreFrameworkHeaders
>+    DESTINATION ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
>+    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
>+    FLATTENED
>+)
>+
>+WEBKIT_COPY_FILES(JavaScriptCorePrivateFrameworkHeaders
>+    DESTINATION ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
>+    FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
>+    FLATTENED
>+)
>+
>+add_dependencies(JavaScriptCore JavaScriptCoreFrameworkHeaders)
>+add_dependencies(JavaScriptCorePrivateFrameworkHeaders JavaScriptCore)
>+
> if (NOT "${PORT}" STREQUAL "Mac")
>     if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
>         WEBKIT_POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index c54bf38ce68..a14e06f7c2a 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-01  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
>+        https://bugs.webkit.org/show_bug.cgi?id=197174
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace WEBKIT_MAKE_FORWARDING_HEADERS with WEBKIT_COPY_FILES and make dependencies
>+        for framework headers explicit.
>+
>+        * CMakeLists.txt:
>+
> 2019-05-01  Darin Adler  <darin@apple.com>
> 
>         WebKit has too much of its own UTF-8 code and should rely more on ICU's UTF-8 support
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 9f68e2f1d8e..260be532bea 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-01  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
>+        https://bugs.webkit.org/show_bug.cgi?id=197174
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace WEBKIT_MAKE_FORWARDING_HEADERS with WEBKIT_COPY_FILES.
>+
>+        * wtf/CMakeLists.txt:
>+
> 2019-05-01  Darin Adler  <darin@apple.com>
> 
>         WebKit has too much of its own UTF-8 code and should rely more on ICU's UTF-8 support
>diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
>index 5a8bb51b94a..b84cc7772b0 100644
>--- a/Source/WTF/wtf/CMakeLists.txt
>+++ b/Source/WTF/wtf/CMakeLists.txt
>@@ -503,8 +503,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
> WEBKIT_FRAMEWORK(WTF)
> 
>-WEBKIT_MAKE_FORWARDING_HEADERS(WTF
>-    TARGET_NAME WTFFrameworkHeaders
>+WEBKIT_COPY_FILES(WTFFrameworkHeaders
>     DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
>     FILES ${WTF_PUBLIC_HEADERS}
> )
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index e06abb5d75b..75de74857b6 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1763,13 +1763,6 @@ set(PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/Pai
> WEBKIT_FRAMEWORK_DECLARE(WebCore)
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
>-    TARGET_NAME WebCorePrivateFrameworkHeaders
>-    DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
>-    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
>-    FLATTENED
>-)
>-
> # Generate CommandLineAPIModuleSource.h
> add_custom_command(
>     OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.h ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.min.js
>@@ -2079,7 +2072,17 @@ endif ()
> 
> WEBKIT_FRAMEWORK(WebCore)
> 
>-add_dependencies(WebCore WebCoreBindings)
>+WEBKIT_COPY_FILES(WebCorePrivateFrameworkHeaders
>+    DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
>+    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
>+    FLATTENED
>+)
>+
>+add_dependencies(WebCore
>+    PALFrameworkHeaders
>+    JavaScriptCorePrivateFrameworkHeaders
>+    WebCoreBindings
>+)
> add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)
> 
> if (APPLE)
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1468db2dc43..f66381ba911 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-01  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
>+        https://bugs.webkit.org/show_bug.cgi?id=197174
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace WEBKIT_MAKE_FORWARDING_HEADERS with WEBKIT_COPY_FILES and make dependencies
>+        for framework headers explicit.
>+
>+        * CMakeLists.txt:
>+
> 2019-05-01  Justin Fan  <justin_fan@apple.com>
> 
>         Update WebGPU class names based on sketch.idl
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 72c230eeb75..eb8272f6f09 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-01  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
>+        https://bugs.webkit.org/show_bug.cgi?id=197174
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace WEBKIT_MAKE_FORWARDING_HEADERS with WEBKIT_COPY_FILES.
>+
>+        * pal/CMakeLists.txt:
>+
> 2019-04-29  Alex Christensen  <achristensen@webkit.org>
> 
>         <rdar://problem/50299396> Fix internal High Sierra build
>diff --git a/Source/WebCore/PAL/pal/CMakeLists.txt b/Source/WebCore/PAL/pal/CMakeLists.txt
>index c50c485b3a7..c7a08043ad7 100644
>--- a/Source/WebCore/PAL/pal/CMakeLists.txt
>+++ b/Source/WebCore/PAL/pal/CMakeLists.txt
>@@ -51,8 +51,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})
> WEBKIT_FRAMEWORK(PAL)
> 
>-WEBKIT_MAKE_FORWARDING_HEADERS(PAL
>-    TARGET_NAME PALFrameworkHeaders
>+WEBKIT_COPY_FILES(PALFrameworkHeaders
>     DESTINATION ${PAL_FRAMEWORK_HEADERS_DIR}/pal
>     FILES ${PAL_PUBLIC_HEADERS}
> )
>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index ce4f200b5fc..f17532c41fa 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -421,7 +421,7 @@ list(APPEND WebKit_SOURCES ${WebKit_DERIVED_SOURCES})
> WEBKIT_COMPUTE_SOURCES(WebKit)
> 
> WEBKIT_FRAMEWORK(WebKit)
>-add_dependencies(WebKit WebCore ${WEBKIT_EXTRA_DEPENDENCIES})
>+add_dependencies(WebKit WebCore WebCorePrivateFrameworkHeaders ${WEBKIT_EXTRA_DEPENDENCIES})
> ADD_WEBKIT_PREFIX_HEADER(WebKit)
> 
> add_executable(WebProcess ${WebProcess_SOURCES})
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1df7f99a6fc..e553d790f5b 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-01  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
>+        https://bugs.webkit.org/show_bug.cgi?id=197174
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace WEBKIT_MAKE_FORWARDING_HEADERS with WEBKIT_COPY_FILES and make dependencies
>+        for framework headers explicit.
>+
>+        * CMakeLists.txt:
>+        * PlatformWin.cmake:
>+
> 2019-05-01  Alex Christensen  <achristensen@webkit.org>
> 
>         Protect against null crash in fetchDiskCacheEntries
>diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
>index 4e9e2a601b8..9e15929564a 100644
>--- a/Source/WebKit/PlatformWin.cmake
>+++ b/Source/WebKit/PlatformWin.cmake
>@@ -370,8 +370,7 @@ if (${WTF_PLATFORM_WIN_CAIRO})
>     )
> endif ()
> 
>-WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
>-    TARGET_NAME WebKitFrameworkHeaders
>+WEBKIT_COPY_FILES(WebKitFrameworkHeaders
>     DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit
>     FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
>     FLATTENED
>diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
>index 4f75c6a3496..894195f304c 100644
>--- a/Source/WebKitLegacy/ChangeLog
>+++ b/Source/WebKitLegacy/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-01  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
>+        https://bugs.webkit.org/show_bug.cgi?id=197174
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace WEBKIT_MAKE_FORWARDING_HEADERS with WEBKIT_COPY_FILES and make dependencies
>+        for framework headers explicit.
>+
>+        * PlatformWin.cmake:
>+
> 2019-04-25  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         Unreviewed, rolling out r244669.
>diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake
>index 3506b154db7..bb9fd77915d 100644
>--- a/Source/WebKitLegacy/PlatformWin.cmake
>+++ b/Source/WebKitLegacy/PlatformWin.cmake
>@@ -496,13 +496,12 @@ set(WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS
>     win/WebKitCOMAPI.h
> )
> 
>-WEBKIT_MAKE_FORWARDING_HEADERS(WebKitLegacyGUID
>-    TARGET_NAME WebKitLegacyFrameworkHeaders
>+WEBKIT_COPY_FILES(WebKitLegacyFrameworkHeaders
>     DESTINATION ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}/WebKitLegacy
>     FILES ${WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS}
>     FLATTENED
> )
>-add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
>+add_dependencies(WebKitLegacyFrameworkHeaders WebKitLegacyGUID)
> 
> set(WebKitLegacy_OUTPUT_NAME
>     WebKit${DEBUG_SUFFIX}
>diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
>index 4aacbd6ddc5..aee62f00d3d 100644
>--- a/Source/cmake/WebKitMacros.cmake
>+++ b/Source/cmake/WebKitMacros.cmake
>@@ -291,46 +291,35 @@ macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)
>     endif ()
> endmacro()
> 
>-function(WEBKIT_MAKE_FORWARDING_HEADERS framework)
>+function(WEBKIT_COPY_FILES target_name)
>     set(options FLATTENED)
>-    set(oneValueArgs DESTINATION TARGET_NAME)
>-    set(multiValueArgs DIRECTORIES FILES)
>+    set(oneValueArgs DESTINATION)
>+    set(multiValueArgs FILES)
>     cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
>-    set(headers ${opt_FILES})
>-    file(MAKE_DIRECTORY ${opt_DESTINATION})
>-    foreach (dir IN LISTS opt_DIRECTORIES)
>-        file(GLOB files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${dir}/*.h)
>-        list(APPEND headers ${files})
>-    endforeach ()
>-    set(fwd_headers)
>-    foreach (header IN LISTS headers)
>-        if (IS_ABSOLUTE ${header})
>-            set(src_header ${header})
>+    set(files ${opt_FILES})
>+    set(dst_files)
>+    foreach (file IN LISTS files)
>+        if (IS_ABSOLUTE ${file})
>+            set(src_file ${file})
>         else ()
>-            set(src_header ${CMAKE_CURRENT_SOURCE_DIR}/${header})
>+            set(src_file ${CMAKE_CURRENT_SOURCE_DIR}/${file})
>         endif ()
>         if (opt_FLATTENED)
>-            get_filename_component(header_filename ${header} NAME)
>-            set(fwd_header ${opt_DESTINATION}/${header_filename})
>+            get_filename_component(filename ${file} NAME)
>+            set(dst_file ${opt_DESTINATION}/${filename})
>         else ()
>-            get_filename_component(header_dir ${header} DIRECTORY)
>-            file(MAKE_DIRECTORY ${opt_DESTINATION}/${header_dir})
>-            set(fwd_header ${opt_DESTINATION}/${header})
>+            get_filename_component(file_dir ${file} DIRECTORY)
>+            file(MAKE_DIRECTORY ${opt_DESTINATION}/${file_dir})
>+            set(dst_file ${opt_DESTINATION}/${file})
>         endif ()
>-        add_custom_command(OUTPUT ${fwd_header}
>-            COMMAND ${CMAKE_COMMAND} -E copy ${src_header} ${fwd_header}
>-            MAIN_DEPENDENCY ${header}
>+        add_custom_command(OUTPUT ${dst_file}
>+            COMMAND ${CMAKE_COMMAND} -E copy ${src_file} ${dst_file}
>+            MAIN_DEPENDENCY ${file}
>             VERBATIM
>         )
>-        list(APPEND fwd_headers ${fwd_header})
>+        list(APPEND dst_files ${dst_file})
>     endforeach ()
>-    if (opt_TARGET_NAME)
>-        set(target_name ${opt_TARGET_NAME})
>-    else ()
>-        set(target_name ${framework}ForwardingHeaders)
>-    endif ()
>-    add_custom_target(${target_name} DEPENDS ${fwd_headers})
>-    add_dependencies(${framework} ${target_name})
>+    add_custom_target(${target_name} DEPENDS ${dst_files})
> endfunction()
> 
> # Helper macros for debugging CMake problems.

Actions: View | Formatted Diff | Diff

Attachments on bug 197174: 368743 | 368746