Changeset 205512 in webkit
- Timestamp:
- Sep 6, 2016 3:06:32 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r205418 r205512 1 2016-09-06 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 [CMake] Decouple generating bindings of WebCore and WebCoreTestSupport 4 https://bugs.webkit.org/show_bug.cgi?id=161474 5 6 Generating bindings of WebCore and WebCoreTestSupport shares a 7 single supplementalDependencyFile. But, nothing supplements any 8 IDL of WebCoreTestSupport. This introduces unnecessary 9 dependencies. 10 11 Reviewed by Alex Christensen. 12 13 * Source/cmake/WebKitMacros.cmake: 14 (GENERATE_BINDINGS): Clear uninitialized variables before 15 use. This causes a problem in the second time of calling 16 GENERATE_BINDINGS. 17 1 18 2016-09-04 Commit Queue <commit-queue@webkit.org> 2 19 -
trunk/Source/WebCore/CMakeLists.txt
r205457 r205512 3617 3617 endforeach () 3618 3618 3619 foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})3620 list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})3621 endforeach ()3622 3623 3619 set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}") 3624 3620 … … 3628 3624 endforeach () 3629 3625 3630 foreach (_idl ${WebCoreTestSupport_IDL_FILES})3631 set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")3632 endforeach ()3633 3634 set(IDL_FILES_LIST "${IDL_FILES_LIST}${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl\n")3635 3626 list(APPEND IDL_INCLUDES --include=${DERIVED_SOURCES_WEBCORE_DIR}) 3636 3627 list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl) … … 3640 3631 add_custom_command( 3641 3632 OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WINDOW_CONSTRUCTORS_FILE} ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE} ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE} 3642 DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${W ebCoreTestSupport_IDL_FILES} ${WEBCORE_DIR}/CMakeLists.txt3633 DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WEBCORE_DIR}/CMakeLists.txt 3643 3634 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} 3644 3635 --dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE} … … 3661 3652 ${ADDITIONAL_BINDINGS_DEPENDENCIES}) 3662 3653 3654 foreach (_include ${WebCoreTestSupport_IDL_INCLUDES}) 3655 list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include}) 3656 endforeach () 3657 3663 3658 GENERATE_BINDINGS(WebCoreTestSupport_SOURCES 3664 3659 "${WebCoreTestSupport_IDL_FILES}" … … 3667 3662 "${FEATURE_DEFINES_JAVASCRIPT}" 3668 3663 ${DERIVED_SOURCES_WEBCORE_DIR} JS JS cpp 3669 ${IDL_ATTRIBUTES_FILE} 3670 ${SUPPLEMENTAL_DEPENDENCY_FILE} 3671 ${ADDITIONAL_BINDINGS_DEPENDENCIES}) 3664 ${IDL_ATTRIBUTES_FILE}) 3672 3665 3673 3666 # WebCore JS Builtins … … 3761 3754 3762 3755 GENERATE_SETTINGS_MACROS(${WEBCORE_DIR}/page/Settings.in SettingsMacros.h) 3756 list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SettingsMacros.h) 3763 3757 list(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.cpp) 3764 3758 -
trunk/Source/WebCore/ChangeLog
r205510 r205512 1 2016-09-06 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 [CMake] Decouple generating bindings of WebCore and WebCoreTestSupport 4 https://bugs.webkit.org/show_bug.cgi?id=161474 5 6 Generating bindings of WebCore and WebCoreTestSupport shares a 7 single supplementalDependencyFile. But, nothing supplements any 8 IDL of WebCoreTestSupport. This introduces unnecessary 9 dependencies. 10 11 Reviewed by Alex Christensen. 12 13 * CMakeLists.txt: Do not input any IDL of WebCoreTestSupport to 14 preprocess-idls.pl. Do not use supplementalDependencyFile to 15 generate bindings of WebCoreTestSupport. Add SettingsMacros.h as 16 a source file of WebCoreDerivedSources to ensure make_settings.pl 17 is finished before compiling WebCoreDerivedSources. 18 1 19 2016-09-06 Zalan Bujtas <zalan@apple.com> 2 20 -
trunk/Source/cmake/WebKitMacros.cmake
r205418 r205512 53 53 # _supplemental_dependency_file is a value of --supplementalDependencyFile. (optional) 54 54 macro(GENERATE_BINDINGS _output_source _input_files _base_dir _idl_includes _features _destination _prefix _generator _extension _idl_attributes_file) 55 set(_supplemental_dependency) 56 set(_supplemental_dependency_file) 57 set(_additional_dependencies) 55 58 set(BINDING_GENERATOR ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl) 56 59 set(_args ${ARGN})
Note: See TracChangeset
for help on using the changeset viewer.