Attachment 372445 Details for Bug 198853 – Patch

[patch] Patch

bug-198853-20190619181536.patch (text/plain), 1.80 KB, created by Fujii Hironori on 2019-06-19 02:15:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2019-06-19 02:15:37 PDT

Size: 1.80 KB

patch

obsolete

>Subversion Revision: 246581
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index b73d4e4b05ad9cbb75c9b5ac75d8b13225df48b3..3a881c7d2854ea5cbe48aac80c51a3779d95b25e 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-19  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [CMake][Win] CombinedDomains.json is generated twice in JavaScriptCore_CopyPrivateHeaders and JavaScriptCore projects
>+        https://bugs.webkit.org/show_bug.cgi?id=198853
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        JavaScriptCore_CopyPrivateHeaders target needs to have a direct or
>+        indirect dependency of JavaScriptCore target for CMake Visual
>+        Studio generator to eliminate duplicated custom commands.
>+
>+        * CMakeLists.txt: Added JavaScriptCore as a dependency of JavaScriptCore_CopyPrivateHeaders.
>+
> 2019-06-18  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] JSLock should be WebThread aware
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index d98353d35a294e96ef15b2436d71e2a32e817924..0d495e2f2aa4779efa0419c62dcc532b178e5206 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -1297,6 +1297,11 @@ WEBKIT_COPY_FILES(JavaScriptCore_CopyPrivateHeaders
>     FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
>     FLATTENED
> )
>+# JavaScriptCore_CopyPrivateHeaders needs to have a direct or indirect
>+# dependency of JavaScriptCore for CMake Visual Studio generator to
>+# eliminate duplicated custom commands. Otherwise,
>+# CombinedDomains.json will be generated in both projects.
>+add_dependencies(JavaScriptCore_CopyPrivateHeaders JavaScriptCore)
> 
> target_include_directories(LLIntSettingsExtractor PRIVATE
>     ${JavaScriptCore_INCLUDE_DIRECTORIES}

Actions: View | Formatted Diff | Diff

Attachments on bug 198853: 372111 | 372445