Changeset 207009 in webkit
- Timestamp:
- Oct 10, 2016 11:29:27 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r206972 r207009 1 2016-10-10 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r206972. 4 https://bugs.webkit.org/show_bug.cgi?id=163227 5 6 Making EWS flaky (Requested by bfulgham_ on #webkit). 7 8 Reverted changeset: 9 10 "[CMake] CMake does not support the dep files for implicit 11 dependency" 12 https://bugs.webkit.org/show_bug.cgi?id=161433 13 http://trac.webkit.org/changeset/206972 14 1 15 2016-10-09 Fujii Hironori <Hironori.Fujii@sony.com> 2 16 -
trunk/Source/WebCore/CMakeLists.txt
r206983 r207009 3633 3633 list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl) 3634 3634 3635 GENERATE_BINDINGS( WebCoreBindings3635 GENERATE_BINDINGS( 3636 3636 OUTPUT_SOURCE WebCore_DERIVED_SOURCES 3637 3637 INPUT_FILES ${WebCore_IDL_FILES} … … 3649 3649 --dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}) 3650 3650 3651 GENERATE_BINDINGS( WebCoreTestSupportBindings3651 GENERATE_BINDINGS( 3652 3652 OUTPUT_SOURCE WebCoreTestSupport_SOURCES 3653 3653 INPUT_FILES ${WebCoreTestSupport_IDL_FILES} … … 3657 3657 DESTINATION ${DERIVED_SOURCES_WEBCORE_DIR} 3658 3658 GENERATOR JS) 3659 3660 # WebCoreTestSupportBindings needs InternalSettingsGenerated.idl3661 add_dependencies(WebCoreTestSupportBindings WebCoreDerivedSources)3662 3659 3663 3660 # WebCore JS Builtins … … 3806 3803 add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES}) 3807 3804 set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX}) 3808 add_dependencies(WebCoreDerivedSources JavaScriptCore WebCoreBindings)3805 add_dependencies(WebCoreDerivedSources JavaScriptCore) 3809 3806 if (NOT WIN32) 3810 3807 list(APPEND WebCore_LIBRARIES WebCoreDerivedSources) … … 3837 3834 include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES}) 3838 3835 add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES}) 3839 add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)3836 add_dependencies(WebCoreTestSupport WebCore) 3840 3837 target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES}) 3841 3838 -
trunk/Source/WebCore/ChangeLog
r207007 r207009 1 2016-10-10 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r206972. 4 https://bugs.webkit.org/show_bug.cgi?id=163227 5 6 Making EWS flaky (Requested by bfulgham_ on #webkit). 7 8 Reverted changeset: 9 10 "[CMake] CMake does not support the dep files for implicit 11 dependency" 12 https://bugs.webkit.org/show_bug.cgi?id=161433 13 http://trac.webkit.org/changeset/206972 14 1 15 2016-10-10 Darin Adler <darin@apple.com> 2 16 -
trunk/Source/cmake/WebKitMacros.cmake
r206972 r207009 1 1 include(CMakeParseArguments) 2 include(ProcessorCount)3 ProcessorCount(PROCESSOR_COUNT)4 2 5 3 macro(WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS) … … 46 44 endmacro() 47 45 48 # Helper macro which wraps generate-bindings-all.pl script. 49 # target is a new target name to be added 46 # Helper macro which wraps preprocess-idls.pl and generate-bindings.pl scripts. 50 47 # OUTPUT_SOURCE is a list name which will contain generated sources.(eg. WebCore_SOURCES) 51 48 # INPUT_FILES are IDL files to generate. … … 58 55 # PP_EXTRA_OUTPUT is extra outputs of preprocess-idls.pl. (optional) 59 56 # PP_EXTRA_ARGS is extra arguments for preprocess-idls.pl. (optional) 60 function(GENERATE_BINDINGS target)57 function(GENERATE_BINDINGS) 61 58 set(options) 62 59 set(oneValueArgs OUTPUT_SOURCE BASE_DIR FEATURES DESTINATION GENERATOR SUPPLEMENTAL_DEPFILE) 63 60 set(multiValueArgs INPUT_FILES IDL_INCLUDES PP_EXTRA_OUTPUT PP_EXTRA_ARGS) 64 61 cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) 65 set(binding_generator ${WEBCORE_DIR}/bindings/scripts/generate-bindings -all.pl)62 set(binding_generator ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl) 66 63 set(idl_attributes_file ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt) 67 set(idl_files_list ${CMAKE_CURRENT_BINARY_DIR}/idl_files_${target}.tmp) 64 set(id ${arg_OUTPUT_SOURCE}) 65 set(idl_files_list ${CMAKE_CURRENT_BINARY_DIR}/idl_files_${id}.tmp) 68 66 set(_supplemental_dependency) 69 67 … … 77 75 file(WRITE ${idl_files_list} ${content}) 78 76 79 set(args80 --defines ${arg_FEATURES}81 --generator ${arg_GENERATOR}82 --outputDir ${arg_DESTINATION}83 --idlFilesList ${idl_files_list}84 --preprocessor ${CODE_GENERATOR_PREPROCESSOR}85 --idlAttributesFile ${idl_attributes_file})86 77 if (arg_SUPPLEMENTAL_DEPFILE) 87 list(APPEND args --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE}) 88 endif () 89 if (PROCESSOR_COUNT) 90 list(APPEND args --numOfJobs ${PROCESSOR_COUNT}) 91 endif () 92 foreach (i IN LISTS arg_IDL_INCLUDES) 93 if (IS_ABSOLUTE ${i}) 94 list(APPEND args --include ${i}) 78 set(_supplemental_dependency --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE}) 79 80 add_custom_command( 81 OUTPUT ${arg_SUPPLEMENTAL_DEPFILE} ${arg_PP_EXTRA_OUTPUT} 82 DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${arg_INPUT_FILES} 83 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines ${arg_FEATURES} --idlFilesList ${idl_files_list} --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE} ${arg_PP_EXTRA_ARGS} 84 VERBATIM) 85 endif () 86 87 set(idl_includes) 88 foreach (dir ${arg_IDL_INCLUDES}) 89 if (IS_ABSOLUTE ${dir}) 90 list(APPEND idl_includes --include=${dir}) 95 91 else () 96 list(APPEND args --include ${CMAKE_CURRENT_SOURCE_DIR}/${i}) 97 endif () 98 endforeach () 99 foreach (i IN LISTS arg_PP_EXTRA_OUTPUT) 100 list(APPEND args --ppExtraOutput ${i}) 101 endforeach () 102 foreach (i IN LISTS arg_PP_EXTRA_ARGS) 103 list(APPEND args --ppExtraArgs ${i}) 92 list(APPEND idl_includes --include=${CMAKE_CURRENT_SOURCE_DIR}/${dir}) 93 endif () 104 94 endforeach () 105 95 106 96 set(common_generator_dependencies 107 ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl 97 ${binding_generator} 98 ${WEBCORE_DIR}/bindings/scripts/CodeGenerator.pm 108 99 ${SCRIPTS_BINDINGS} 100 ${arg_SUPPLEMENTAL_DEPFILE} 101 ${idl_attributes_file} 109 102 ) 103 list(APPEND common_generator_dependencies ${arg_PP_EXTRA_OUTPUT}) 104 110 105 if (EXISTS ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm) 111 106 list(APPEND common_generator_dependencies ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm) … … 114 109 list(APPEND common_generator_dependencies ${arg_BASE_DIR}/CodeGenerator${arg_GENERATOR}.pm) 115 110 endif () 116 foreach (i IN LISTS common_generator_dependencies)117 list(APPEND args --generatorDependency ${i})118 endforeach ()119 111 120 112 set(gen_sources) 121 set(gen_headers)122 113 foreach (_file ${arg_INPUT_FILES}) 123 114 get_filename_component(_name ${_file} NAME_WE) 115 116 add_custom_command( 117 OUTPUT ${arg_DESTINATION}/JS${_name}.cpp ${arg_DESTINATION}/JS${_name}.h 118 MAIN_DEPENDENCY ${_file} 119 DEPENDS ${common_generator_dependencies} 120 COMMAND ${PERL_EXECUTABLE} ${binding_generator} --defines ${arg_FEATURES} --generator ${arg_GENERATOR} ${idl_includes} --outputDir ${arg_DESTINATION} --preprocessor ${CODE_GENERATOR_PREPROCESSOR} --idlAttributesFile ${idl_attributes_file} ${_supplemental_dependency} ${_file} 121 WORKING_DIRECTORY ${arg_BASE_DIR} 122 VERBATIM) 124 123 list(APPEND gen_sources ${arg_DESTINATION}/JS${_name}.cpp) 125 list(APPEND gen_headers ${arg_DESTINATION}/JS${_name}.h)126 124 endforeach () 127 125 set(${arg_OUTPUT_SOURCE} ${${arg_OUTPUT_SOURCE}} ${gen_sources} PARENT_SCOPE) 128 set(act_args)129 if (${CMAKE_VERSION} VERSION_LESS 3.2)130 set_source_files_properties(${gen_sources} ${gen_headers} PROPERTIES GENERATED 1)131 else ()132 list(APPEND act_args133 BYPRODUCTS ${gen_sources} ${gen_headers}134 USES_TERMINAL135 )136 endif ()137 add_custom_target(${target}138 COMMAND ${PERL_EXECUTABLE} ${binding_generator} ${args}139 WORKING_DIRECTORY ${arg_BASE_DIR}140 COMMENT "Generate bindings (${target})"141 VERBATIM ${act_args})142 126 endfunction() 143 127 -
trunk/Tools/ChangeLog
r206993 r207009 1 2016-10-10 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r206972. 4 https://bugs.webkit.org/show_bug.cgi?id=163227 5 6 Making EWS flaky (Requested by bfulgham_ on #webkit). 7 8 Reverted changeset: 9 10 "[CMake] CMake does not support the dep files for implicit 11 dependency" 12 https://bugs.webkit.org/show_bug.cgi?id=161433 13 http://trac.webkit.org/changeset/206972 14 1 15 2016-10-10 Youenn Fablet <youenn@apple.com> 2 16 -
trunk/Tools/DumpRenderTree/CMakeLists.txt
r206972 r207009 121 121 ) 122 122 123 GENERATE_BINDINGS( DumpRenderTreeBindings123 GENERATE_BINDINGS( 124 124 OUTPUT_SOURCE DumpRenderTree_SOURCES 125 125 INPUT_FILES ${DumpRenderTree_IDL_FILES} … … 136 136 add_executable(DumpRenderTree ${DumpRenderTree_SOURCES}) 137 137 target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES}) 138 add_dependencies(DumpRenderTree DumpRenderTreeBindings)139 138 140 139 if (ENABLE_NETSCAPE_PLUGIN_API) -
trunk/Tools/WebKitTestRunner/CMakeLists.txt
r206972 r207009 98 98 ) 99 99 100 GENERATE_BINDINGS( WebKitTestRunnerInjectedBundleBindings100 GENERATE_BINDINGS( 101 101 OUTPUT_SOURCE WebKitTestRunnerInjectedBundle_SOURCES 102 102 INPUT_FILES ${WebKitTestRunnerInjectedBundle_IDL_FILES} … … 107 107 GENERATOR TestRunner) 108 108 109 GENERATE_BINDINGS( WebKitTestRunnerBindings109 GENERATE_BINDINGS( 110 110 OUTPUT_SOURCE WebKitTestRunner_SOURCES 111 111 INPUT_FILES ${WebKitTestRunner_IDL_FILES} … … 123 123 add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) 124 124 target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) 125 add_dependencies(TestRunnerInjectedBundle WebKitTestRunnerInjectedBundleBindings)126 125 127 126 add_executable(WebKitTestRunner ${WebKitTestRunner_SOURCES}) 128 127 target_link_libraries(WebKitTestRunner ${WebKitTestRunner_LIBRARIES}) 129 add_dependencies(WebKitTestRunner WebKitTestRunnerBindings)130 128 131 129 if (NOT APPLE)
Note: See TracChangeset
for help on using the changeset viewer.