Title: [205512] trunk
- Revision
- 205512
- Author
- [email protected]
- Date
- 2016-09-06 15:06:32 -0700 (Tue, 06 Sep 2016)
Log Message
[CMake] Decouple generating bindings of WebCore and WebCoreTestSupport
https://bugs.webkit.org/show_bug.cgi?id=161474
Generating bindings of WebCore and WebCoreTestSupport shares a
single supplementalDependencyFile. But, nothing supplements any
IDL of WebCoreTestSupport. This introduces unnecessary
dependencies.
Patch by Fujii Hironori <[email protected]> on 2016-09-06
Reviewed by Alex Christensen.
.:
* Source/cmake/WebKitMacros.cmake:
(GENERATE_BINDINGS): Clear uninitialized variables before
use. This causes a problem in the second time of calling
GENERATE_BINDINGS.
Source/WebCore:
* CMakeLists.txt: Do not input any IDL of WebCoreTestSupport to
preprocess-idls.pl. Do not use supplementalDependencyFile to
generate bindings of WebCoreTestSupport. Add SettingsMacros.h as
a source file of WebCoreDerivedSources to ensure make_settings.pl
is finished before compiling WebCoreDerivedSources.
Modified Paths
Diff
Modified: trunk/ChangeLog (205511 => 205512)
--- trunk/ChangeLog 2016-09-06 21:54:11 UTC (rev 205511)
+++ trunk/ChangeLog 2016-09-06 22:06:32 UTC (rev 205512)
@@ -1,3 +1,20 @@
+2016-09-06 Fujii Hironori <[email protected]>
+
+ [CMake] Decouple generating bindings of WebCore and WebCoreTestSupport
+ https://bugs.webkit.org/show_bug.cgi?id=161474
+
+ Generating bindings of WebCore and WebCoreTestSupport shares a
+ single supplementalDependencyFile. But, nothing supplements any
+ IDL of WebCoreTestSupport. This introduces unnecessary
+ dependencies.
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/WebKitMacros.cmake:
+ (GENERATE_BINDINGS): Clear uninitialized variables before
+ use. This causes a problem in the second time of calling
+ GENERATE_BINDINGS.
+
2016-09-04 Commit Queue <[email protected]>
Unreviewed, rolling out r205415.
Modified: trunk/Source/WebCore/CMakeLists.txt (205511 => 205512)
--- trunk/Source/WebCore/CMakeLists.txt 2016-09-06 21:54:11 UTC (rev 205511)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-09-06 22:06:32 UTC (rev 205512)
@@ -3616,10 +3616,6 @@
list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
endforeach ()
-foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})
- list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
-endforeach ()
-
set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
# Create _javascript_ C++ code given an IDL input
@@ -3627,11 +3623,6 @@
set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
endforeach ()
-foreach (_idl ${WebCoreTestSupport_IDL_FILES})
- set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
-endforeach ()
-
-set(IDL_FILES_LIST "${IDL_FILES_LIST}${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl\n")
list(APPEND IDL_INCLUDES --include=${DERIVED_SOURCES_WEBCORE_DIR})
list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl)
@@ -3639,7 +3630,7 @@
add_custom_command(
OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WINDOW_CONSTRUCTORS_FILE} ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE} ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES} ${WEBCORE_DIR}/CMakeLists.txt
+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WEBCORE_DIR}/CMakeLists.txt
COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --windowConstructorsFile ${WINDOW_CONSTRUCTORS_FILE} --workerGlobalScopeConstructorsFile ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
--dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
VERBATIM)
@@ -3660,6 +3651,10 @@
${SUPPLEMENTAL_DEPENDENCY_FILE}
${ADDITIONAL_BINDINGS_DEPENDENCIES})
+foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})
+ list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
+endforeach ()
+
GENERATE_BINDINGS(WebCoreTestSupport_SOURCES
"${WebCoreTestSupport_IDL_FILES}"
"${WEBCORE_DIR}"
@@ -3666,9 +3661,7 @@
"${IDL_INCLUDES}"
"${FEATURE_DEFINES_JAVASCRIPT}"
${DERIVED_SOURCES_WEBCORE_DIR} JS JS cpp
- ${IDL_ATTRIBUTES_FILE}
- ${SUPPLEMENTAL_DEPENDENCY_FILE}
- ${ADDITIONAL_BINDINGS_DEPENDENCIES})
+ ${IDL_ATTRIBUTES_FILE})
# WebCore JS Builtins
@@ -3760,6 +3753,7 @@
GENERATE_SETTINGS_MACROS(${WEBCORE_DIR}/page/Settings.in SettingsMacros.h)
+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SettingsMacros.h)
list(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.cpp)
Modified: trunk/Source/WebCore/ChangeLog (205511 => 205512)
--- trunk/Source/WebCore/ChangeLog 2016-09-06 21:54:11 UTC (rev 205511)
+++ trunk/Source/WebCore/ChangeLog 2016-09-06 22:06:32 UTC (rev 205512)
@@ -1,3 +1,21 @@
+2016-09-06 Fujii Hironori <[email protected]>
+
+ [CMake] Decouple generating bindings of WebCore and WebCoreTestSupport
+ https://bugs.webkit.org/show_bug.cgi?id=161474
+
+ Generating bindings of WebCore and WebCoreTestSupport shares a
+ single supplementalDependencyFile. But, nothing supplements any
+ IDL of WebCoreTestSupport. This introduces unnecessary
+ dependencies.
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Do not input any IDL of WebCoreTestSupport to
+ preprocess-idls.pl. Do not use supplementalDependencyFile to
+ generate bindings of WebCoreTestSupport. Add SettingsMacros.h as
+ a source file of WebCoreDerivedSources to ensure make_settings.pl
+ is finished before compiling WebCoreDerivedSources.
+
2016-09-06 Zalan Bujtas <[email protected]>
ASSERTION FAILED: !paintInfo.overlapTestRequests->contains(this) in WebCore::RenderWidget::paintContents
Modified: trunk/Source/cmake/WebKitMacros.cmake (205511 => 205512)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-09-06 21:54:11 UTC (rev 205511)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-09-06 22:06:32 UTC (rev 205512)
@@ -52,6 +52,9 @@
# _generator is a value of --generator argument.
# _supplemental_dependency_file is a value of --supplementalDependencyFile. (optional)
macro(GENERATE_BINDINGS _output_source _input_files _base_dir _idl_includes _features _destination _prefix _generator _extension _idl_attributes_file)
+ set(_supplemental_dependency)
+ set(_supplemental_dependency_file)
+ set(_additional_dependencies)
set(BINDING_GENERATOR ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl)
set(_args ${ARGN})
list(LENGTH _args _argCount)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
