Unreviewed, rolling out r244881.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 May 2019 14:32:23 +0000 (14:32 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 May 2019 14:32:23 +0000 (14:32 +0000)
https://bugs.webkit.org/show_bug.cgi?id=197559

Breaks compilation of jsconly on linux, breaking compilation
for jsc-i386-ews, jsc-mips-ews and jsc-armv7-ews (Requested by
guijemont on #webkit).

Reverted changeset:

"[CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into
WEBKIT_COPY_FILES"
https://bugs.webkit.org/show_bug.cgi?id=197174
https://trac.webkit.org/changeset/244881

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

18 files changed:
ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/CMakeLists.txt
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit/PlatformWin.cmake
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/PlatformWin.cmake
Source/cmake/WebKitMacros.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/PlatformGTK.cmake
Tools/TestWebKitAPI/PlatformWPE.cmake

index 0db00af..35c5607 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2019-05-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244881.
+        https://bugs.webkit.org/show_bug.cgi?id=197559
+
+        Breaks compilation of jsconly on linux, breaking compilation
+        for jsc-i386-ews, jsc-mips-ews and jsc-armv7-ews (Requested by
+        guijemont on #webkit).
+
+        Reverted changeset:
+
+        "[CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into
+        WEBKIT_COPY_FILES"
+        https://bugs.webkit.org/show_bug.cgi?id=197174
+        https://trac.webkit.org/changeset/244881
+
 2019-05-02  Christopher Reid  <chris.reid@sony.com>
 
         [CMake] Add support for LTO builds
index 86a73f8..a12c074 100644 (file)
@@ -296,9 +296,9 @@ add_executable(LLIntOffsetsExtractor
 )
 
 target_link_libraries(LLIntSettingsExtractor WTF)
-add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders WTFFrameworkHeaders)
+add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders)
 target_link_libraries(LLIntOffsetsExtractor WTF)
-add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders WTFFrameworkHeaders)
+add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders)
 
 # 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,6 +1274,20 @@ 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}
@@ -1292,21 +1306,6 @@ 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)
index 7b7f0f6..c05005e 100644 (file)
@@ -1,3 +1,19 @@
+2019-05-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244881.
+        https://bugs.webkit.org/show_bug.cgi?id=197559
+
+        Breaks compilation of jsconly on linux, breaking compilation
+        for jsc-i386-ews, jsc-mips-ews and jsc-armv7-ews (Requested by
+        guijemont on #webkit).
+
+        Reverted changeset:
+
+        "[CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into
+        WEBKIT_COPY_FILES"
+        https://bugs.webkit.org/show_bug.cgi?id=197174
+        https://trac.webkit.org/changeset/244881
+
 2019-05-02  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
index cb3ea89..963b1e9 100644 (file)
@@ -1,3 +1,19 @@
+2019-05-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244881.
+        https://bugs.webkit.org/show_bug.cgi?id=197559
+
+        Breaks compilation of jsconly on linux, breaking compilation
+        for jsc-i386-ews, jsc-mips-ews and jsc-armv7-ews (Requested by
+        guijemont on #webkit).
+
+        Reverted changeset:
+
+        "[CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into
+        WEBKIT_COPY_FILES"
+        https://bugs.webkit.org/show_bug.cgi?id=197174
+        https://trac.webkit.org/changeset/244881
+
 2019-05-02  Alex Christensen  <achristensen@webkit.org>
 
         Mark U+01C0 as a homograph of U+006C
index b84cc77..5a8bb51 100644 (file)
@@ -503,7 +503,8 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
 WEBKIT_FRAMEWORK(WTF)
 
-WEBKIT_COPY_FILES(WTFFrameworkHeaders
+WEBKIT_MAKE_FORWARDING_HEADERS(WTF
+    TARGET_NAME WTFFrameworkHeaders
     DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
     FILES ${WTF_PUBLIC_HEADERS}
 )
index 75de748..e06abb5 100644 (file)
@@ -1763,6 +1763,13 @@ 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
@@ -2072,17 +2079,7 @@ endif ()
 
 WEBKIT_FRAMEWORK(WebCore)
 
-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(WebCore WebCoreBindings)
 add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)
 
 if (APPLE)
index bc3c831..586dc3e 100644 (file)
@@ -1,3 +1,19 @@
+2019-05-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244881.
+        https://bugs.webkit.org/show_bug.cgi?id=197559
+
+        Breaks compilation of jsconly on linux, breaking compilation
+        for jsc-i386-ews, jsc-mips-ews and jsc-armv7-ews (Requested by
+        guijemont on #webkit).
+
+        Reverted changeset:
+
+        "[CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into
+        WEBKIT_COPY_FILES"
+        https://bugs.webkit.org/show_bug.cgi?id=197174
+        https://trac.webkit.org/changeset/244881
+
 2019-05-03  Joonghun Park  <jh718.park@samsung.com>
 
         Resolve the percentage values of inset properties against proper box.
index 9549e18..93052c3 100644 (file)
@@ -1,3 +1,19 @@
+2019-05-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244881.
+        https://bugs.webkit.org/show_bug.cgi?id=197559
+
+        Breaks compilation of jsconly on linux, breaking compilation
+        for jsc-i386-ews, jsc-mips-ews and jsc-armv7-ews (Requested by
+        guijemont on #webkit).
+
+        Reverted changeset:
+
+        "[CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into
+        WEBKIT_COPY_FILES"
+        https://bugs.webkit.org/show_bug.cgi?id=197174
+        https://trac.webkit.org/changeset/244881
+
 2019-05-02  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
index c7a0804..c50c485 100644 (file)
@@ -51,7 +51,8 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})
 WEBKIT_FRAMEWORK(PAL)
 
-WEBKIT_COPY_FILES(PALFrameworkHeaders
+WEBKIT_MAKE_FORWARDING_HEADERS(PAL
+    TARGET_NAME PALFrameworkHeaders
     DESTINATION ${PAL_FRAMEWORK_HEADERS_DIR}/pal
     FILES ${PAL_PUBLIC_HEADERS}
 )
index f17532c..ce4f200 100644 (file)
@@ -421,7 +421,7 @@ list(APPEND WebKit_SOURCES ${WebKit_DERIVED_SOURCES})
 WEBKIT_COMPUTE_SOURCES(WebKit)
 
 WEBKIT_FRAMEWORK(WebKit)
-add_dependencies(WebKit WebCore WebCorePrivateFrameworkHeaders ${WEBKIT_EXTRA_DEPENDENCIES})
+add_dependencies(WebKit WebCore ${WEBKIT_EXTRA_DEPENDENCIES})
 ADD_WEBKIT_PREFIX_HEADER(WebKit)
 
 add_executable(WebProcess ${WebProcess_SOURCES})
index ad5a964..16fe326 100644 (file)
@@ -1,3 +1,19 @@
+2019-05-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244881.
+        https://bugs.webkit.org/show_bug.cgi?id=197559
+
+        Breaks compilation of jsconly on linux, breaking compilation
+        for jsc-i386-ews, jsc-mips-ews and jsc-armv7-ews (Requested by
+        guijemont on #webkit).
+
+        Reverted changeset:
+
+        "[CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into
+        WEBKIT_COPY_FILES"
+        https://bugs.webkit.org/show_bug.cgi?id=197174
+        https://trac.webkit.org/changeset/244881
+
 2019-05-02  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         REGRESSION: Layout test editing/selection/ios/selection-after-changing-text-with-callout-menu.html is failing
index 9e15929..4e9e2a6 100644 (file)
@@ -370,7 +370,8 @@ if (${WTF_PLATFORM_WIN_CAIRO})
     )
 endif ()
 
-WEBKIT_COPY_FILES(WebKitFrameworkHeaders
+WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
+    TARGET_NAME WebKitFrameworkHeaders
     DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit
     FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
     FLATTENED
index 5cc4231..69790e8 100644 (file)
@@ -1,3 +1,19 @@
+2019-05-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244881.
+        https://bugs.webkit.org/show_bug.cgi?id=197559
+
+        Breaks compilation of jsconly on linux, breaking compilation
+        for jsc-i386-ews, jsc-mips-ews and jsc-armv7-ews (Requested by
+        guijemont on #webkit).
+
+        Reverted changeset:
+
+        "[CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into
+        WEBKIT_COPY_FILES"
+        https://bugs.webkit.org/show_bug.cgi?id=197174
+        https://trac.webkit.org/changeset/244881
+
 2019-05-02  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into WEBKIT_COPY_FILES
index bb9fd77..3506b15 100644 (file)
@@ -496,12 +496,13 @@ set(WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS
     win/WebKitCOMAPI.h
 )
 
-WEBKIT_COPY_FILES(WebKitLegacyFrameworkHeaders
+WEBKIT_MAKE_FORWARDING_HEADERS(WebKitLegacyGUID
+    TARGET_NAME WebKitLegacyFrameworkHeaders
     DESTINATION ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}/WebKitLegacy
     FILES ${WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS}
     FLATTENED
 )
-add_dependencies(WebKitLegacyFrameworkHeaders WebKitLegacyGUID)
+add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
 
 set(WebKitLegacy_OUTPUT_NAME
     WebKit${DEBUG_SUFFIX}
index aee62f0..4aacbd6 100644 (file)
@@ -291,35 +291,46 @@ macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)
     endif ()
 endmacro()
 
-function(WEBKIT_COPY_FILES target_name)
+function(WEBKIT_MAKE_FORWARDING_HEADERS framework)
     set(options FLATTENED)
-    set(oneValueArgs DESTINATION)
-    set(multiValueArgs FILES)
+    set(oneValueArgs DESTINATION TARGET_NAME)
+    set(multiValueArgs DIRECTORIES FILES)
     cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    set(files ${opt_FILES})
-    set(dst_files)
-    foreach (file IN LISTS files)
-        if (IS_ABSOLUTE ${file})
-            set(src_file ${file})
+    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})
         else ()
-            set(src_file ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+            set(src_header ${CMAKE_CURRENT_SOURCE_DIR}/${header})
         endif ()
         if (opt_FLATTENED)
-            get_filename_component(filename ${file} NAME)
-            set(dst_file ${opt_DESTINATION}/${filename})
+            get_filename_component(header_filename ${header} NAME)
+            set(fwd_header ${opt_DESTINATION}/${header_filename})
         else ()
-            get_filename_component(file_dir ${file} DIRECTORY)
-            file(MAKE_DIRECTORY ${opt_DESTINATION}/${file_dir})
-            set(dst_file ${opt_DESTINATION}/${file})
+            get_filename_component(header_dir ${header} DIRECTORY)
+            file(MAKE_DIRECTORY ${opt_DESTINATION}/${header_dir})
+            set(fwd_header ${opt_DESTINATION}/${header})
         endif ()
-        add_custom_command(OUTPUT ${dst_file}
-            COMMAND ${CMAKE_COMMAND} -E copy ${src_file} ${dst_file}
-            MAIN_DEPENDENCY ${file}
+        add_custom_command(OUTPUT ${fwd_header}
+            COMMAND ${CMAKE_COMMAND} -E copy ${src_header} ${fwd_header}
+            MAIN_DEPENDENCY ${header}
             VERBATIM
         )
-        list(APPEND dst_files ${dst_file})
+        list(APPEND fwd_headers ${fwd_header})
     endforeach ()
-    add_custom_target(${target_name} DEPENDS ${dst_files})
+    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})
 endfunction()
 
 # Helper macros for debugging CMake problems.
index f24b0cf..fa00bb9 100644 (file)
@@ -1,3 +1,19 @@
+2019-05-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244881.
+        https://bugs.webkit.org/show_bug.cgi?id=197559
+
+        Breaks compilation of jsconly on linux, breaking compilation
+        for jsc-i386-ews, jsc-mips-ews and jsc-armv7-ews (Requested by
+        guijemont on #webkit).
+
+        Reverted changeset:
+
+        "[CMake] Refactor WEBKIT_MAKE_FORWARDING_HEADERS into
+        WEBKIT_COPY_FILES"
+        https://bugs.webkit.org/show_bug.cgi?id=197174
+        https://trac.webkit.org/changeset/244881
+
 2019-05-03  Zan Dobersek  <zdobersek@igalia.com>
 
         Unreviewed WPE build fix after r244898.
index a22aea3..6aca35b 100644 (file)
@@ -119,10 +119,6 @@ set(TestJSC_LIBRARIES
     JavaScriptCore
 )
 
-set(TestJSC_DEPENDENCIES
-    JavaScriptCorePrivateFrameworkHeaders
-)
-
 set(TestJSC_DEFINITIONS
     WEBKIT_SRC_DIR="${CMAKE_SOURCE_DIR}"
 )
index 74c9369..82749a8 100644 (file)
@@ -117,10 +117,6 @@ set(TestJSC_LIBRARIES
     JavaScriptCore
 )
 
-set(TestJSC_DEPENDENCIES
-    JavaScriptCorePrivateFrameworkHeaders
-)
-
 set(TestJSC_DEFINITIONS
     WEBKIT_SRC_DIR="${CMAKE_SOURCE_DIR}"
 )