Attachment 367837 Details for Bug 196916 – Patch

[patch] Patch

bug-196916.diff (text/plain), 9.54 KB, created by Don Olmstead on 2019-04-19 14:58:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-04-19 14:58:31 PDT

Size: 9.54 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 5b4b673e653..329b99eef90 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-04-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Remove WEBKIT_WRAP_SOURCELIST
>+        https://bugs.webkit.org/show_bug.cgi?id=196916
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WEBKIT_WRAP_SOURCELIST macro is used only to adjust source groups in Visual Studio
>+        projects without any impact on build process. Its references variable specific to
>+        particular targets (WebCore) which contradicts our goal of having target-oriented
>+        CMake project. It can be reintroduced later in a more clean way, in case anyone needs
>+        to have such grouping.
>+
>+        * Source/cmake/WebKitMacros.cmake:
>+
> 2019-04-18  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         [WinCairo] Non-unified build fails to link Tools
>diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
>index 3bbf37a598e..fed2083cb13 100644
>--- a/PerformanceTests/ChangeLog
>+++ b/PerformanceTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-04-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Remove WEBKIT_WRAP_SOURCELIST
>+        https://bugs.webkit.org/show_bug.cgi?id=196916
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * MallocBench/MallocBench/CMakeLists.txt:
>+
> 2019-04-16  Jon Lee  <jonlee@apple.com>
> 
>         [MotionMark] The text "kkkj" is causing Firefox console warning: `unreachable code after return statement`
>diff --git a/PerformanceTests/MallocBench/MallocBench/CMakeLists.txt b/PerformanceTests/MallocBench/MallocBench/CMakeLists.txt
>index ede622432e2..3e0273ff701 100644
>--- a/PerformanceTests/MallocBench/MallocBench/CMakeLists.txt
>+++ b/PerformanceTests/MallocBench/MallocBench/CMakeLists.txt
>@@ -41,9 +41,6 @@ set(MALLOC_BENCH_LIBRARIES
> 
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-WEBKIT_WRAP_SOURCELIST(${MALLOC_BENCH_SOURCES})
>-
>-
> include_directories(${MALLOC_BENCH_INCLUDE_DIRECTORIES})
> 
> SET(CMAKE_SKIP_BUILD_RPATH  TRUE)
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index ab69001d005..3949be8cb9c 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -1303,7 +1303,6 @@ target_include_directories(LLIntOffsetsExtractor SYSTEM PRIVATE ${JavaScriptCore
> add_subdirectory(shell)
> 
> WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
>-WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
> WEBKIT_FRAMEWORK(JavaScriptCore)
> 
> if (NOT "${PORT}" STREQUAL "Mac")
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 02169b75868..1e96ba7f04b 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Remove WEBKIT_WRAP_SOURCELIST
>+        https://bugs.webkit.org/show_bug.cgi?id=196916
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt:
>+        * shell/CMakeLists.txt:
>+
> 2019-04-18  Saam barati  <sbarati@apple.com>
> 
>         Remove useConcurrentBarriers option
>diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
>index aa7ce64ec1c..f7e84ce4748 100644
>--- a/Source/JavaScriptCore/shell/CMakeLists.txt
>+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
>@@ -33,8 +33,6 @@ set(TESTAPI_SOURCES
> 
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
>-WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
> include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
> include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
> add_executable(jsc ${JSC_SOURCES})
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index d9914fc2a6c..46167de9adb 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-04-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Remove WEBKIT_WRAP_SOURCELIST
>+        https://bugs.webkit.org/show_bug.cgi?id=196916
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/CMakeLists.txt:
>+
> 2019-04-18  Chris Dumez  <cdumez@apple.com>
> 
>         [iOS] Improve detection of when web views go to background / foreground
>diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
>index 3c3f25161db..1a1714bd2b9 100644
>--- a/Source/WTF/wtf/CMakeLists.txt
>+++ b/Source/WTF/wtf/CMakeLists.txt
>@@ -501,7 +501,6 @@ list(APPEND WTF_LIBRARIES
> WEBKIT_FRAMEWORK_DECLARE(WTF)
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
> WEBKIT_FRAMEWORK(WTF)
> 
> WEBKIT_MAKE_FORWARDING_HEADERS(WTF
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index cc376ad425f..788e59c51cb 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -2064,10 +2064,7 @@ list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLNSNames.cpp)
> GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
> list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLNames.cpp)
> 
>-WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES})
> WEBKIT_COMPUTE_SOURCES(WebCore)
>-WEBKIT_WRAP_SOURCELIST(${WebCore_SOURCES})
>-WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
> 
> if (MSVC)
>     WEBKIT_ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 70bec1c45e8..f01eb4929d0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-04-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Remove WEBKIT_WRAP_SOURCELIST
>+        https://bugs.webkit.org/show_bug.cgi?id=196916
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt:
>+
> 2019-04-18  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         Implement KeyedDecoderGeneric and KeyedEncoderGeneric
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 177b62ba37b..efa1a9be04b 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-04-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Remove WEBKIT_WRAP_SOURCELIST
>+        https://bugs.webkit.org/show_bug.cgi?id=196916
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/CMakeLists.txt:
>+
> 2019-04-15  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] WebCore derived sources should only be referenced inside WebCore
>diff --git a/Source/WebCore/PAL/pal/CMakeLists.txt b/Source/WebCore/PAL/pal/CMakeLists.txt
>index c50c485b3a7..9bfdac6ed4c 100644
>--- a/Source/WebCore/PAL/pal/CMakeLists.txt
>+++ b/Source/WebCore/PAL/pal/CMakeLists.txt
>@@ -48,7 +48,6 @@ set(PAL_LIBRARIES
> WEBKIT_FRAMEWORK_DECLARE(PAL)
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})
> WEBKIT_FRAMEWORK(PAL)
> 
> WEBKIT_MAKE_FORWARDING_HEADERS(PAL
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 2ee2704bcdf..2da077acbb5 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-04-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Remove WEBKIT_WRAP_SOURCELIST
>+        https://bugs.webkit.org/show_bug.cgi?id=196916
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformWin.cmake:
>+
> 2019-04-19  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r244447.
>diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
>index 543701b1696..6d6e022956d 100644
>--- a/Source/WebKit/PlatformWin.cmake
>+++ b/Source/WebKit/PlatformWin.cmake
>@@ -190,8 +190,6 @@ set(SharedWebKitLibraries
>     ${WebKit_LIBRARIES}
> )
> 
>-WEBKIT_WRAP_SOURCELIST(${WebKit_SOURCES})
>-
> set(WebKit_FORWARDING_HEADERS_DIRECTORIES
>     Shared/API/c
> 
>diff --git a/Source/bmalloc/CMakeLists.txt b/Source/bmalloc/CMakeLists.txt
>index aeead582f3e..ce9a0fa804b 100644
>--- a/Source/bmalloc/CMakeLists.txt
>+++ b/Source/bmalloc/CMakeLists.txt
>@@ -46,7 +46,6 @@ set(bmalloc_LIBRARIES
> 
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
> include_directories(${bmalloc_INCLUDE_DIRECTORIES})
> add_library(bmalloc STATIC ${bmalloc_SOURCES})
> target_link_libraries(bmalloc ${bmalloc_LIBRARIES})
>diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
>index b5b1398d0a3..6cbf9b3becd 100644
>--- a/Source/bmalloc/ChangeLog
>+++ b/Source/bmalloc/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-04-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Remove WEBKIT_WRAP_SOURCELIST
>+        https://bugs.webkit.org/show_bug.cgi?id=196916
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt:
>+
> 2019-04-18  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         Unreviewed, fix build failure
>diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
>index a065b1cdc22..5be3eb67910 100644
>--- a/Source/cmake/WebKitMacros.cmake
>+++ b/Source/cmake/WebKitMacros.cmake
>@@ -122,20 +122,6 @@ macro(WEBKIT_ADD_PRECOMPILED_HEADER _header _cpp _source)
>     #FIXME: Add support for Xcode.
> endmacro()
> 
>-macro(WEBKIT_WRAP_SOURCELIST)
>-    foreach (_file ${ARGN})
>-        get_filename_component(_basename ${_file} NAME_WE)
>-        get_filename_component(_path ${_file} PATH)
>-
>-        if (NOT _file MATCHES "${DERIVED_SOURCES_WEBCORE_DIR}")
>-            string(REGEX REPLACE "/" "\\\\\\\\" _sourcegroup "${_path}")
>-            source_group("${_sourcegroup}" FILES ${_file})
>-        endif ()
>-    endforeach ()
>-
>-    source_group("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_WEBCORE_DIR}")
>-endmacro()
>-
> macro(WEBKIT_FRAMEWORK_DECLARE _target)
>     # add_library() without any source files triggers CMake warning
>     # Addition of dummy "source" file does not result in any changes in generated build.ninja file

Actions: View | Formatted Diff | Diff

Attachments on bug 196916: 367424 | 367834 | 367837 | 415567