Title: [294273] trunk/Source/WebCore
Revision
294273
Author
hironori.fu...@sony.com
Date
2022-05-16 15:56:32 -0700 (Mon, 16 May 2022)

Log Message

[CMake][VS] PrivateHeaders/WebCore/WebCoreJSBuiltinInternals.h is not updated in incremental build
https://bugs.webkit.org/show_bug.cgi?id=240297

Reviewed by Don Olmstead.

In CMake Visual Studio generator builds,
WebCoreJSBuiltinInternals.h was not copied to the private headers
directory as expected in incremental builds.

${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h was
added to both WebCore_SOURCES and WebCore_PRIVATE_FRAMEWORK_HEADERS.
This caused the incremental build problem. Don't add the headers
to WebCore_SOURCES.

There was another minor problem. ${WebCore_BUILTINS_SOURCES} was
passed to the MAIN_DEPENDENCY argument of add_custom_command.
However, MAIN_DEPENDENCY argument should take a single file. It
should be passed to DEPENDS argument.

* CMakeLists.txt:

Modified Paths

Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (294272 => 294273)


--- trunk/Source/WebCore/CMakeLists.txt	2022-05-16 22:43:21 UTC (rev 294272)
+++ trunk/Source/WebCore/CMakeLists.txt	2022-05-16 22:56:32 UTC (rev 294273)
@@ -2377,15 +2377,12 @@
            ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.cpp
            ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.h
            ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h
-    MAIN_DEPENDENCY ${WebCore_BUILTINS_SOURCES}
-    DEPENDS ${BUILTINS_GENERATOR_SCRIPTS} ${WebCore_DERIVED_BUILTIN_HEADERS}
+    DEPENDS ${BUILTINS_GENERATOR_SCRIPTS} ${WebCore_DERIVED_BUILTIN_HEADERS} ${WebCore_BUILTINS_SOURCES}
     COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py --wrappers-only --framework WebCore --output-directory ${WebCore_DERIVED_SOURCES_DIR} ${WebCore_BUILTINS_SOURCES}
     VERBATIM)
 list(APPEND WebCore_SOURCES
     ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.cpp
-    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.cpp
-    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltins.h
-    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h)
+    ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.cpp)
 
 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
 

Modified: trunk/Source/WebCore/ChangeLog (294272 => 294273)


--- trunk/Source/WebCore/ChangeLog	2022-05-16 22:43:21 UTC (rev 294272)
+++ trunk/Source/WebCore/ChangeLog	2022-05-16 22:56:32 UTC (rev 294273)
@@ -1,3 +1,26 @@
+2022-05-16  Fujii Hironori  <hironori.fu...@sony.com>
+
+        [CMake][VS] PrivateHeaders/WebCore/WebCoreJSBuiltinInternals.h is not updated in incremental build
+        https://bugs.webkit.org/show_bug.cgi?id=240297
+
+        Reviewed by Don Olmstead.
+
+        In CMake Visual Studio generator builds,
+        WebCoreJSBuiltinInternals.h was not copied to the private headers
+        directory as expected in incremental builds.
+
+        ${WebCore_DERIVED_SOURCES_DIR}/WebCoreJSBuiltinInternals.h was
+        added to both WebCore_SOURCES and WebCore_PRIVATE_FRAMEWORK_HEADERS.
+        This caused the incremental build problem. Don't add the headers
+        to WebCore_SOURCES.
+
+        There was another minor problem. ${WebCore_BUILTINS_SOURCES} was
+        passed to the MAIN_DEPENDENCY argument of add_custom_command.
+        However, MAIN_DEPENDENCY argument should take a single file. It
+        should be passed to DEPENDS argument.
+
+        * CMakeLists.txt:
+
 2022-05-16  Tim Nguyen  <n...@apple.com>
 
         [css-ui] Unexpose attachment and borderless-attachment appearance values
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to