Fix IDL dependency computation for partial interfaces

Source/bindings/derived_sources.gyp

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 
   'variables': {
     'main_idl_files': [
       '<@(core_idl_files)',
       '<@(modules_idl_files)',
       '<@(svg_idl_files)',
     ],
     'support_idl_files': [
       '<@(webcore_testing_support_idl_files)',
     ],
-    'testing_support_idl_files': [
-      '<@(webcore_testing_support_idl_files)',
+    'generated_support_idl_files': [
       '<@(generated_webcore_testing_support_idl_files)',
     ],
     'compiler_module_files': [
         'scripts/idl_compiler.py',
         '<(DEPTH)/third_party/ply/lex.py',
         '<(DEPTH)/third_party/ply/yacc.py',
         # jinja2/__init__.py contains version string, so sufficient for package
         '<(DEPTH)/third_party/jinja2/__init__.py',
         '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
         '<(DEPTH)/tools/idl_parser/idl_lexer.py',
@@ skipping 135 matching lines @@
       'type': 'none',
       # The 'binding' rule generates .h files, so mark as hard_dependency, per:
       # https://code.google.com/p/gyp/wiki/InputFormatReference#Linking_Dependencies
       'hard_dependency': 1,
       'dependencies': [
         'interface_dependencies',
         '../core/core_derived_sources.gyp:generate_test_support_idls',
       ],
       'sources': [
         '<@(main_idl_files)',
-        '<@(testing_support_idl_files)',
+        '<@(support_idl_files)',
+        '<@(generated_support_idl_files)',
       ],
       'rules': [{
         'rule_name': 'binding',
         'extension': 'idl',
         'msvs_external_rule': 1,
         'inputs': [
           'scripts/generate_bindings.pl',
           'scripts/code_generator_v8.pm',
           'scripts/idl_parser.pm',
           'scripts/idl_serializer.pm',
           '../build/scripts/preprocessor.pm',
           '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)/blink/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.
           #
           # 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 <@(main_idl_files))',
+          '<!@pymod_do_main(list_idl_files_with_partial_interface <@(main_idl_files) <@(support_idl_files))',
           # Generated IDLs are all partial interfaces, hence everything
           # potentially depends on them.
           '<@(generated_global_constructors_idl_files)',
         ],
         'outputs': [
           '<(bindings_output_dir)/V8<(RULE_INPUT_ROOT).cpp',
           '<(bindings_output_dir)/V8<(RULE_INPUT_ROOT).h',
         ],
         'variables': {
           # IDL include paths. The generator will search recursively for IDL
@@ skipping 19 matching lines @@
           'scripts/generate_bindings.pl',
           '--outputDir',
           '<(bindings_output_dir)',
           '--idlAttributesFile',
           'scripts/IDLAttributes.txt',
           '<@(generator_include_dirs)',
           '<@(extra_blink_generator_include_dirs)',
           '--interfaceDependenciesFile',
           '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
           '--additionalIdlFiles',
-          '<(testing_support_idl_files)',
+          '<@(support_idl_files) <@(generated_support_idl_files)',

[kihong, 2013/10/23 08:18:44]

IMHO, we don't need support_idl_files here also?

[Nils Barth (inactive), 2013/10/23 10:29:00]

Got it, removed, and updated comments to reflect these.

OIC:
Now that support_idl_files are included in InterfaceDependencies,
we can remove them from this list of additional files.
OTOH, we have to list the generated files, since they're not present
at GYP run time, so we don't include them in InterfaceDependencies.

We could include generated files in InterfaceDependencies,
and then we could get rid of additionalIdlFiles,
but this would require some hacking.

           '<@(preprocessor)',
           '<@(write_file_only_if_changed)',
           '<(RULE_INPUT_PATH)',
         ],
         'message': 'Generating binding from <(RULE_INPUT_PATH)',
       }],
     },
     {
       'target_name': 'bindings_derived_sources',
       'type': 'none',
@@ skipping 15 matching lines @@
           '../build/scripts/action_derivedsourcesallinone.py',
           '<(SHARED_INTERMEDIATE_DIR)/blink/BindingsDerivedSources.txt',
           '--',
           '<@(derived_sources_aggregate_files)',
         ],
         'message': 'Generating bindings derived sources',
       }],
     },
   ],
 }