Support partial interface for test support idls

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 35 matching lines @@
       '<@(python_core_idl_files)',
       '<@(python_modules_idl_files)',
       '<@(python_svg_idl_files)',
     ],
     'perl_and_python_idl_files': [
         '<@(deprecated_perl_idl_files)',
         '<@(python_idl_files)',
     ],
     'webcore_test_support_idl_files': [
         '<@(deprecated_perl_webcore_test_support_idl_files)',
+        '<@(deprecated_perl_generated_webcore_test_support_idl_files)',
         '<@(python_webcore_test_support_idl_files)',
     ],
+    'test_support_perl_and_python_idl_files': [
+        '<@(deprecated_perl_webcore_test_support_idl_files)',
+        '<@(python_webcore_test_support_idl_files)',
+    ],
+    'deprecated_perl_bindings_test_support_idl_files': [
+        '<@(deprecated_perl_webcore_test_support_idl_files)',
+        '<@(deprecated_perl_generated_webcore_test_support_idl_files)',
+    ],
     'compiler_module_files': [
         'scripts/idl_compiler.py',
         '<(DEPTH)/third_party/ply/lex.py',
         '<(DEPTH)/third_party/ply/yacc.py',
         '<(DEPTH)/tools/idl_parser/idl_lexer.py',
         '<(DEPTH)/tools/idl_parser/idl_node.py',
         '<(DEPTH)/tools/idl_parser/idl_parser.py',
         'scripts/blink_idl_lexer.py',
         'scripts/blink_idl_parser.py',
         'scripts/code_generator_v8.py',
@@ skipping 76 matching lines @@
 
   'targets': [{
     'target_name': 'interface_dependencies',
     'type': 'none',
     'actions': [{
       '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 <@(perl_and_python_idl_files))',
+        'test_support_idl_files_list': '<|(test_support_idl_files_list.tmp <@(test_support_perl_and_python_idl_files))',
       },
       'inputs': [
         'scripts/compute_dependencies.py',
         '<(idl_files_list)',
         '<!@(cat <(idl_files_list))',
+        '<(test_support_idl_files_list)',
+        '<!@(cat <(test_support_idl_files_list))',
        ],
        'outputs': [
          '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
+         '<(SHARED_INTERMEDIATE_DIR)/blink/TestSupportInterfaceDependencies.txt',
          '<@(generated_global_constructors_idl_files)',
          '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
        ],
        'msvs_cygwin_shell': 0,
        'action': [
          'python',
          'scripts/compute_dependencies.py',
          '--idl-files-list',
          '<(idl_files_list)',
          '--interface-dependencies-file',
          '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
+         '--test-support-idl-files-list',

[do-not-use, 2013/09/09 07:42:09]

Nils or haraken likely know better at this point with all the recent changes.
Would it make sense to call compute_dependencies.py twice? once of regular IDLs
and once for test_support ones?

This way we could reuse the same script arguments and avoid duplication in the
scripts.

[Nils Barth (inactive), 2013/09/10 09:52:10]

Agreed, that's much cleaner (to call twice)!
(Second time don't generate the global constructors IDL files.)

+         '<(test_support_idl_files_list)',
+         '--test-support-interface-dependencies-file',
+         '<(SHARED_INTERMEDIATE_DIR)/blink/TestSupportInterfaceDependencies.txt',
          '--window-constructors-file',
          '<(SHARED_INTERMEDIATE_DIR)/blink/WindowConstructors.idl',
          '--workerglobalscope-constructors-file',
          '<(SHARED_INTERMEDIATE_DIR)/blink/WorkerGlobalScopeConstructors.idl',
          '--sharedworkerglobalscope-constructors-file',
          '<(SHARED_INTERMEDIATE_DIR)/blink/SharedWorkerGlobalScopeConstructors.idl',
          '--dedicatedworkerglobalscope-constructors-file',
          '<(SHARED_INTERMEDIATE_DIR)/blink/DedicatedWorkerGlobalScopeConstructors.idl',
          '--event-names-file',
          '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
          '<@(write_file_only_if_changed)',
        ],
        'message': 'Resolving partial interfaces dependencies in all IDL files',
       }]
     },
     {
       'target_name': 'deprecated_perl_bindings_sources',
       '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': [
         '<@(deprecated_perl_idl_files)',
-        '<@(deprecated_perl_webcore_test_support_idl_files)',
+        '<@(deprecated_perl_bindings_test_support_idl_files)',
       ],
       'rules': [{
         'rule_name': 'deprecated_perl_binding',
         'extension': 'idl',
         'msvs_external_rule': 1,
         'inputs': [
           'scripts/deprecated_generate_bindings.pl',
           'scripts/deprecated_code_generator_v8.pm',
           'scripts/deprecated_idl_parser.pm',
           'scripts/deprecated_idl_serializer.pm',
           '../core/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',
+          '<(SHARED_INTERMEDIATE_DIR)/blink/TestSupportInterfaceDependencies.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 <@(perl_and_python_idl_files))',
           # Generated IDLs are all partial interfaces, hence everything
           # potentially depends on them.
           '<@(generated_global_constructors_idl_files)',
@@ skipping 25 matching lines @@
           '-I<(DEPTH)/third_party/JSON/out/lib/perl5',
           'scripts/deprecated_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',
+          '--testSupportInterfaceDependenciesFile',

[do-not-use, 2013/09/09 07:27:10]

It is not clear to me yet why the test support IDLs need to be passed separately
now. This leads to some duplication in the scripts.

[Nils Barth (inactive), 2013/09/10 09:52:10]

That's a good question -- it puzzled me at first too.
The issue is that the dependencies file is also used by
action_derivedsourcesallinone.py
to generate derived sources, so we can't put the test support files in there.

(This could be changed, which is a different and cleaner approach, but a bit
more involved.)

+          '<(SHARED_INTERMEDIATE_DIR)/blink/TestSupportInterfaceDependencies.txt',
           '--additionalIdlFiles',
-          '<(deprecated_perl_webcore_test_support_idl_files)',
+          '<(deprecated_perl_generated_webcore_test_support_idl_files)',
           '<@(preprocessor)',
           '<@(write_file_only_if_changed)',
           '<(RULE_INPUT_PATH)',
         ],
         'message': 'Generating binding from <(RULE_INPUT_PATH)',
       }],
     },
     {
       'target_name': 'python_bindings_sources',
       'type': 'none',
@@ skipping 87 matching lines @@
           '../core/scripts/action_derivedsourcesallinone.py',
           '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
           '--',
           '<@(derived_sources_aggregate_files)',
         ],
         'message': 'Generating bindings derived sources',
       }],
     },
   ],
 }