| Index: Source/bindings/derived_sources.gyp
|
| diff --git a/Source/bindings/derived_sources.gyp b/Source/bindings/derived_sources.gyp
|
| index 842bb194ddf909816e01c24ce19008f3a9f983f2..35d44d8ec3d83c44824fcbeb6846465ce99d549f 100644
|
| --- a/Source/bindings/derived_sources.gyp
|
| +++ b/Source/bindings/derived_sources.gyp
|
| @@ -100,33 +100,33 @@
|
| },
|
|
|
| 'targets': [{
|
| - 'target_name': 'supplemental_dependencies',
|
| + 'target_name': 'interface_dependencies',
|
| 'type': 'none',
|
| 'actions': [{
|
| - 'action_name': 'generatePartialInterfacesDependency',
|
| + 'action_name': 'compute_interface_dependencies',
|
| 'variables': {
|
| # Write sources into a file, so that the action command line won't
|
| # exceed OS limits.
|
| 'idl_files_list': '<|(idl_files_list.tmp <@(idl_files))',
|
| },
|
| 'inputs': [
|
| - 'scripts/preprocess_idls.py',
|
| + 'scripts/compute_dependencies.py',
|
| '<(idl_files_list)',
|
| '<!@(cat <(idl_files_list))',
|
| ],
|
| 'outputs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
|
| + '<(SHARED_INTERMEDIATE_DIR)/InterfaceDependencies.txt',
|
| '<@(generated_global_constructors_idl_files)',
|
| '<(SHARED_INTERMEDIATE_DIR)/EventNames.in',
|
| ],
|
| 'msvs_cygwin_shell': 0,
|
| 'action': [
|
| 'python',
|
| - 'scripts/preprocess_idls.py',
|
| + 'scripts/compute_dependencies.py',
|
| '--idl-files-list',
|
| '<(idl_files_list)',
|
| - '--supplemental-dependency-file',
|
| - '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
|
| + '--interface-dependencies-file',
|
| + '<(SHARED_INTERMEDIATE_DIR)/InterfaceDependencies.txt',
|
| '--window-constructors-file',
|
| '<(SHARED_INTERMEDIATE_DIR)/WindowConstructors.idl',
|
| '--workerglobalscope-constructors-file',
|
| @@ -149,7 +149,7 @@
|
| # https://code.google.com/p/gyp/wiki/InputFormatReference#Linking_Dependencies
|
| 'hard_dependency': 1,
|
| 'dependencies': [
|
| - 'supplemental_dependencies',
|
| + 'interface_dependencies',
|
| '../core/core_derived_sources.gyp:generate_test_support_idls',
|
| ],
|
| 'sources': [
|
| @@ -169,11 +169,14 @@
|
| 'scripts/IDLAttributes.txt',
|
| # FIXME: If the dependency structure changes, we rebuild all files,
|
| # since we're not computing dependencies file-by-file in the build.
|
| - '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
|
| + '<(SHARED_INTERMEDIATE_DIR)/InterfaceDependencies.txt',
|
| # FIXME: Similarly, if any partial interface changes, rebuild
|
| # everything, since every IDL potentially depends on them, because
|
| # we're not computing dependencies file-by-file.
|
| - '<!@pymod_do_main(supplemental_idl_files <@(idl_files))',
|
| + #
|
| + # If a new partial interface is added, need to regyp to update these
|
| + # dependencies, as these are computed statically at gyp runtime.
|
| + '<!@pymod_do_main(list_idl_files_with_partial_interface <@(idl_files))',
|
| # Generated IDLs are all partial interfaces, hence everything
|
| # potentially depends on them.
|
| '<@(generated_global_constructors_idl_files)',
|
| @@ -212,8 +215,8 @@
|
| '<(feature_defines)',
|
| '<@(generator_include_dirs)',
|
| '<@(extra_blink_generator_include_dirs)',
|
| - '--supplementalDependencyFile',
|
| - '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
|
| + '--interfaceDependenciesFile',
|
| + '<(SHARED_INTERMEDIATE_DIR)/InterfaceDependencies.txt',
|
| '--additionalIdlFiles',
|
| '<(webcore_test_support_idl_files)',
|
| '<@(preprocessor)',
|
| @@ -227,14 +230,14 @@
|
| 'target_name': 'bindings_derived_sources',
|
| 'type': 'none',
|
| 'dependencies': [
|
| - 'supplemental_dependencies',
|
| + 'interface_dependencies',
|
| 'bindings_sources',
|
| ],
|
| 'actions': [{
|
| 'action_name': 'derived_sources_all_in_one',
|
| 'inputs': [
|
| '../core/scripts/action_derivedsourcesallinone.py',
|
| - '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
|
| + '<(SHARED_INTERMEDIATE_DIR)/InterfaceDependencies.txt',
|
| ],
|
| 'outputs': [
|
| '<@(derived_sources_aggregate_files)',
|
| @@ -242,7 +245,7 @@
|
| 'action': [
|
| 'python',
|
| '../core/scripts/action_derivedsourcesallinone.py',
|
| - '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
|
| + '<(SHARED_INTERMEDIATE_DIR)/InterfaceDependencies.txt',
|
| '--',
|
| '<@(derived_sources_aggregate_files)',
|
| ],
|
|
|