Changeset 207009 in webkit


Ignore:
Timestamp:
Oct 10, 2016 11:29:27 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r206972.
https://bugs.webkit.org/show_bug.cgi?id=163227

Making EWS flaky (Requested by bfulgham_ on #webkit).

Reverted changeset:

"[CMake] CMake does not support the dep files for implicit
dependency"
https://bugs.webkit.org/show_bug.cgi?id=161433
http://trac.webkit.org/changeset/206972

Location:
trunk
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r206972 r207009  
     12016-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
    1152016-10-09  Fujii Hironori  <Hironori.Fujii@sony.com>
    216
  • trunk/Source/WebCore/CMakeLists.txt

    r206983 r207009  
    36333633list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl)
    36343634
    3635 GENERATE_BINDINGS(WebCoreBindings
     3635GENERATE_BINDINGS(
    36363636    OUTPUT_SOURCE WebCore_DERIVED_SOURCES
    36373637    INPUT_FILES ${WebCore_IDL_FILES}
     
    36493649        --dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
    36503650
    3651 GENERATE_BINDINGS(WebCoreTestSupportBindings
     3651GENERATE_BINDINGS(
    36523652    OUTPUT_SOURCE WebCoreTestSupport_SOURCES
    36533653    INPUT_FILES ${WebCoreTestSupport_IDL_FILES}
     
    36573657    DESTINATION ${DERIVED_SOURCES_WEBCORE_DIR}
    36583658    GENERATOR JS)
    3659 
    3660 # WebCoreTestSupportBindings needs InternalSettingsGenerated.idl
    3661 add_dependencies(WebCoreTestSupportBindings WebCoreDerivedSources)
    36623659
    36633660# WebCore JS Builtins
     
    38063803add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
    38073804set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
    3808 add_dependencies(WebCoreDerivedSources JavaScriptCore WebCoreBindings)
     3805add_dependencies(WebCoreDerivedSources JavaScriptCore)
    38093806if (NOT WIN32)
    38103807    list(APPEND WebCore_LIBRARIES WebCoreDerivedSources)
     
    38373834include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES})
    38383835add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
    3839 add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
     3836add_dependencies(WebCoreTestSupport WebCore)
    38403837target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
    38413838
  • trunk/Source/WebCore/ChangeLog

    r207007 r207009  
     12016-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
    1152016-10-10  Darin Adler  <darin@apple.com>
    216
  • trunk/Source/cmake/WebKitMacros.cmake

    r206972 r207009  
    11include(CMakeParseArguments)
    2 include(ProcessorCount)
    3 ProcessorCount(PROCESSOR_COUNT)
    42
    53macro(WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS)
     
    4644endmacro()
    4745
    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.
    5047#   OUTPUT_SOURCE is a list name which will contain generated sources.(eg. WebCore_SOURCES)
    5148#   INPUT_FILES are IDL files to generate.
     
    5855#   PP_EXTRA_OUTPUT is extra outputs of preprocess-idls.pl. (optional)
    5956#   PP_EXTRA_ARGS is extra arguments for preprocess-idls.pl. (optional)
    60 function(GENERATE_BINDINGS target)
     57function(GENERATE_BINDINGS)
    6158    set(options)
    6259    set(oneValueArgs OUTPUT_SOURCE BASE_DIR FEATURES DESTINATION GENERATOR SUPPLEMENTAL_DEPFILE)
    6360    set(multiValueArgs INPUT_FILES IDL_INCLUDES PP_EXTRA_OUTPUT PP_EXTRA_ARGS)
    6461    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)
    6663    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)
    6866    set(_supplemental_dependency)
    6967
     
    7775    file(WRITE ${idl_files_list} ${content})
    7876
    79     set(args
    80         --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})
    8677    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})
    9591        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 ()
    10494    endforeach ()
    10595
    10696    set(common_generator_dependencies
    107         ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl
     97        ${binding_generator}
     98        ${WEBCORE_DIR}/bindings/scripts/CodeGenerator.pm
    10899        ${SCRIPTS_BINDINGS}
     100        ${arg_SUPPLEMENTAL_DEPFILE}
     101        ${idl_attributes_file}
    109102    )
     103    list(APPEND common_generator_dependencies ${arg_PP_EXTRA_OUTPUT})
     104
    110105    if (EXISTS ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm)
    111106        list(APPEND common_generator_dependencies ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm)
     
    114109        list(APPEND common_generator_dependencies ${arg_BASE_DIR}/CodeGenerator${arg_GENERATOR}.pm)
    115110    endif ()
    116     foreach (i IN LISTS common_generator_dependencies)
    117         list(APPEND args --generatorDependency ${i})
    118     endforeach ()
    119111
    120112    set(gen_sources)
    121     set(gen_headers)
    122113    foreach (_file ${arg_INPUT_FILES})
    123114        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)
    124123        list(APPEND gen_sources ${arg_DESTINATION}/JS${_name}.cpp)
    125         list(APPEND gen_headers ${arg_DESTINATION}/JS${_name}.h)
    126124    endforeach ()
    127125    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_args
    133             BYPRODUCTS ${gen_sources} ${gen_headers}
    134             USES_TERMINAL
    135         )
    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})
    142126endfunction()
    143127
  • trunk/Tools/ChangeLog

    r206993 r207009  
     12016-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
    1152016-10-10  Youenn Fablet  <youenn@apple.com>
    216
  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r206972 r207009  
    121121)
    122122
    123 GENERATE_BINDINGS(DumpRenderTreeBindings
     123GENERATE_BINDINGS(
    124124    OUTPUT_SOURCE DumpRenderTree_SOURCES
    125125    INPUT_FILES ${DumpRenderTree_IDL_FILES}
     
    136136add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
    137137target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
    138 add_dependencies(DumpRenderTree DumpRenderTreeBindings)
    139138
    140139if (ENABLE_NETSCAPE_PLUGIN_API)
  • trunk/Tools/WebKitTestRunner/CMakeLists.txt

    r206972 r207009  
    9898)
    9999
    100 GENERATE_BINDINGS(WebKitTestRunnerInjectedBundleBindings
     100GENERATE_BINDINGS(
    101101    OUTPUT_SOURCE WebKitTestRunnerInjectedBundle_SOURCES
    102102    INPUT_FILES ${WebKitTestRunnerInjectedBundle_IDL_FILES}
     
    107107    GENERATOR TestRunner)
    108108
    109 GENERATE_BINDINGS(WebKitTestRunnerBindings
     109GENERATE_BINDINGS(
    110110    OUTPUT_SOURCE WebKitTestRunner_SOURCES
    111111    INPUT_FILES ${WebKitTestRunner_IDL_FILES}
     
    123123add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
    124124target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
    125 add_dependencies(TestRunnerInjectedBundle WebKitTestRunnerInjectedBundleBindings)
    126125
    127126add_executable(WebKitTestRunner ${WebKitTestRunner_SOURCES})
    128127target_link_libraries(WebKitTestRunner ${WebKitTestRunner_LIBRARIES})
    129 add_dependencies(WebKitTestRunner WebKitTestRunnerBindings)
    130128
    131129if (NOT APPLE)
Note: See TracChangeset for help on using the changeset viewer.