Changeset 205512 in webkit


Ignore:
Timestamp:
Sep 6, 2016 3:06:32 PM (8 years ago)
Author:
commit-queue@webkit.org
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 <Fujii Hironori> 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.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r205418 r205512  
     12016-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
    1182016-09-04  Commit Queue  <commit-queue@webkit.org>
    219
  • trunk/Source/WebCore/CMakeLists.txt

    r205457 r205512  
    36173617endforeach ()
    36183618
    3619 foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})
    3620     list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
    3621 endforeach ()
    3622 
    36233619set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
    36243620
     
    36283624endforeach ()
    36293625
    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")
    36353626list(APPEND IDL_INCLUDES --include=${DERIVED_SOURCES_WEBCORE_DIR})
    36363627list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl)
     
    36403631add_custom_command(
    36413632    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} ${WebCoreTestSupport_IDL_FILES} ${WEBCORE_DIR}/CMakeLists.txt
     3633    DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WEBCORE_DIR}/CMakeLists.txt
    36433634    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}
    36443635--dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
     
    36613652    ${ADDITIONAL_BINDINGS_DEPENDENCIES})
    36623653
     3654foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})
     3655    list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
     3656endforeach ()
     3657
    36633658GENERATE_BINDINGS(WebCoreTestSupport_SOURCES
    36643659    "${WebCoreTestSupport_IDL_FILES}"
     
    36673662    "${FEATURE_DEFINES_JAVASCRIPT}"
    36683663    ${DERIVED_SOURCES_WEBCORE_DIR} JS JS cpp
    3669     ${IDL_ATTRIBUTES_FILE}
    3670     ${SUPPLEMENTAL_DEPENDENCY_FILE}
    3671     ${ADDITIONAL_BINDINGS_DEPENDENCIES})
     3664    ${IDL_ATTRIBUTES_FILE})
    36723665
    36733666# WebCore JS Builtins
     
    37613754
    37623755GENERATE_SETTINGS_MACROS(${WEBCORE_DIR}/page/Settings.in SettingsMacros.h)
     3756list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SettingsMacros.h)
    37633757list(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.cpp)
    37643758
  • trunk/Source/WebCore/ChangeLog

    r205510 r205512  
     12016-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
    1192016-09-06  Zalan Bujtas  <zalan@apple.com>
    220
  • trunk/Source/cmake/WebKitMacros.cmake

    r205418 r205512  
    5353#   _supplemental_dependency_file is a value of --supplementalDependencyFile. (optional)
    5454macro(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)
    5558    set(BINDING_GENERATOR ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl)
    5659    set(_args ${ARGN})
Note: See TracChangeset for help on using the changeset viewer.