Make EventInterfaces.in build step not depend on bindings generation

Source/bindings/generated_bindings.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 17 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
 # Generate IDL bindings, together with auxiliary files
 # (constructors on global objects, aggregate bindings files).
 #
 # Design doc: http://www.chromium.org/developers/design-documents/idl-build
 
 {
   'includes': [
-    '../build/scripts/scripts.gypi',
-    '../build/win/precompile.gypi',

[Nils Barth (inactive), 2014/04/01 06:20:38]

These includes are unnecessary, and note that scripts.gypi is duplicated!

-    '../build/scripts/scripts.gypi',
+    'bindings.gypi',
     '../core/core.gypi',
     '../modules/modules.gypi',
-    'bindings.gypi',
   ],
 
   'variables': {
     # IDL file lists; see: http://www.chromium.org/developers/web-idl-interfaces
     #
     # Interface IDL files / Dependency IDL files
     # Interface IDL files: generate individual bindings (includes testing)
     'interface_idl_files': [
       '<@(static_interface_idl_files)',
       '<@(generated_interface_idl_files)',
@@ skipping 44 matching lines @@
 
     # Generated IDL files
     'generated_interface_idl_files': [
       '<@(generated_webcore_testing_idl_files)',  # interfaces
     ],
     'generated_dependency_idl_files': [
       '<@(generated_global_constructors_idl_files)',  # partial interfaces
     ],
 
     'generated_global_constructors_idl_files': [
-      '<(SHARED_INTERMEDIATE_DIR)/blink/WindowConstructors.idl',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/WorkerGlobalScopeConstructors.idl',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/SharedWorkerGlobalScopeConstructors.idl',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/DedicatedWorkerGlobalScopeConstructors.idl',
-      '<(SHARED_INTERMEDIATE_DIR)/ServiceWorkerGlobalScopeConstructors.idl',
+      '<(blink_output_dir)/WindowConstructors.idl',
+      '<(blink_output_dir)/WorkerGlobalScopeConstructors.idl',
+      '<(blink_output_dir)/SharedWorkerGlobalScopeConstructors.idl',
+      '<(blink_output_dir)/DedicatedWorkerGlobalScopeConstructors.idl',
+      '<(blink_output_dir)/ServiceWorkerGlobalScopeConstructors.idl',
     ],
 
     'generated_global_constructors_header_files': [
-      '<(SHARED_INTERMEDIATE_DIR)/blink/WindowConstructors.h',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/WorkerGlobalScopeConstructors.h',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/SharedWorkerGlobalScopeConstructors.h',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/DedicatedWorkerGlobalScopeConstructors.h',
-      '<(SHARED_INTERMEDIATE_DIR)/ServiceWorkerGlobalScopeConstructors.h',
+      '<(blink_output_dir)/WindowConstructors.h',
+      '<(blink_output_dir)/WorkerGlobalScopeConstructors.h',
+      '<(blink_output_dir)/SharedWorkerGlobalScopeConstructors.h',
+      '<(blink_output_dir)/DedicatedWorkerGlobalScopeConstructors.h',
+      '<(blink_output_dir)/ServiceWorkerGlobalScopeConstructors.h',
     ],
 
 
     # Python source
     'jinja_module_files': [
       # jinja2/__init__.py contains version string, so sufficient for package
       '<(DEPTH)/third_party/jinja2/__init__.py',
       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
     ],
     'idl_lexer_parser_files': [
@@ skipping 29 matching lines @@
     # Jinja templates
     'code_generator_template_files': [
       'templates/attributes.cpp',
       'templates/callback_interface.cpp',
       'templates/callback_interface.h',
       'templates/interface_base.cpp',
       'templates/interface.cpp',
       'templates/interface.h',
       'templates/methods.cpp',
     ],
-
-
-    'bindings_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/bindings',
-
-    'conditions': [
-      # The bindings generator can skip writing generated files if they are
-      # identical to the already existing file, which avoids recompilation.
-      # However, a dependency (earlier build step) having a newer timestamp than
-      # an output (later build step) confuses some build systems, so only use
-      # this on ninja, which explicitly supports this use case (gyp turns all
-      # actions into ninja restat rules).
-      ['"<(GENERATOR)"=="ninja"', {
-        'write_file_only_if_changed': '--write-file-only-if-changed 1',
-      }, {
-        'write_file_only_if_changed': '--write-file-only-if-changed 0',
-      }],
-    ],
   },
 
   'targets': [
 ################################################################################
   {
     'target_name': 'global_constructors_idls',
     'type': 'none',
     'actions': [{
       'action_name': 'generate_global_constructors_idls',
       'inputs': [
         'scripts/generate_global_constructors.py',
         'scripts/utilities.py',
         # Only includes main IDL files (exclude dependencies and testing,
         # which should not appear on global objects).
         '<(main_interface_idl_files_list)',
         '<@(main_interface_idl_files)',
       ],
       'outputs': [
         '<@(generated_global_constructors_idl_files)',
         '<@(generated_global_constructors_header_files)',
       ],
       'action': [
         'python',
         'scripts/generate_global_constructors.py',
         '--idl-files-list',
         '<(main_interface_idl_files_list)',
-        '<@(write_file_only_if_changed)',
+        '--write-file-only-if-changed',

[Nils Barth (inactive), 2014/04/01 06:20:38]

List context expansion is confusing here;
better to be explicit about the flag.

+        '<(write_file_only_if_changed)',
         '--',
         'Window',
-        '<(SHARED_INTERMEDIATE_DIR)/blink/WindowConstructors.idl',
+        '<(blink_output_dir)/WindowConstructors.idl',
         'WorkerGlobalScope',
-        '<(SHARED_INTERMEDIATE_DIR)/blink/WorkerGlobalScopeConstructors.idl',
+        '<(blink_output_dir)/WorkerGlobalScopeConstructors.idl',
         'SharedWorkerGlobalScope',
-        '<(SHARED_INTERMEDIATE_DIR)/blink/SharedWorkerGlobalScopeConstructors.idl',
+        '<(blink_output_dir)/SharedWorkerGlobalScopeConstructors.idl',
         'DedicatedWorkerGlobalScope',
-        '<(SHARED_INTERMEDIATE_DIR)/blink/DedicatedWorkerGlobalScopeConstructors.idl',
+        '<(blink_output_dir)/DedicatedWorkerGlobalScopeConstructors.idl',
         'ServiceWorkerGlobalScope',
-        '<(SHARED_INTERMEDIATE_DIR)/ServiceWorkerGlobalScopeConstructors.idl',
+        '<(blink_output_dir)/ServiceWorkerGlobalScopeConstructors.idl',

[Nils Barth (inactive), 2014/04/01 06:20:38]

Notice the error in ServiceWorker?
(Missed blink/ dir.)
Using a variable for this avoids this possible error.

        ],
        'message': 'Generating IDL files for constructors on global objects',
       }]
   },
 ################################################################################
   {
     'target_name': 'interfaces_info',
     'type': 'none',
     'dependencies': [
       # Generated IDLs
       'global_constructors_idls',
       '../core/core_generated.gyp:generated_testing_idls',
     ],
     'actions': [{
       'action_name': 'compute_interfaces_info',
       'inputs': [
         'scripts/compute_interfaces_info.py',
         'scripts/utilities.py',
         '<(static_idl_files_list)',
         '<@(static_idl_files)',
         '<@(generated_idl_files)',
       ],
       'outputs': [
-        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
+        '<(blink_output_dir)/InterfacesInfo.pickle',
       ],
       'action': [
         'python',
         'scripts/compute_interfaces_info.py',
         '--idl-files-list',
         '<(static_idl_files_list)',
         '--interfaces-info-file',
-        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
-        '<@(write_file_only_if_changed)',
+        '<(blink_output_dir)/InterfacesInfo.pickle',
+        '--write-file-only-if-changed',
+        '<(write_file_only_if_changed)',
         '--',
         # Generated files must be passed at command line
         '<@(generated_idl_files)',
       ],
       'message': 'Computing global information about IDL files',
       }]
   },
 ################################################################################
   {
-    'target_name': 'event_interfaces',
-    'type': 'none',
-    'dependencies': [
-      'interfaces_info',
-    ],
-    'actions': [{
-      'action_name': 'generate_event_interfaces',
-      'inputs': [
-        'scripts/generate_event_interfaces.py',
-        'scripts/utilities.py',
-        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
-      ],
-      'outputs': [
-        '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
-      ],
-      'action': [
-        'python',
-        'scripts/generate_event_interfaces.py',
-        '--interfaces-info-file',
-        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
-        '--event-interfaces-file',
-        '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
-        '<@(write_file_only_if_changed)',
-      ],
-      'message': 'Generating list of Event interfaces',
-      }]
-  },
-################################################################################
-  {
     # A separate pre-caching step is *not required* to use lex/parse table
     # caching in PLY, as the caches are concurrency-safe.
     # However, pre-caching ensures that all compiler processes use the cached
     # files (hence maximizing speed), instead of early processes building the
     # tables themselves (as they've not yet been written when they start).
     'target_name': 'cached_yacc_tables',
     'type': 'none',
     'actions': [{
       'action_name': 'cache_yacc_tables',
       'inputs': [
@@ skipping 61 matching lines @@
         '<@(idl_lexer_parser_files)',  # to be explicit (covered by parsetab)
         '<@(idl_compiler_files)',
         '<(bindings_output_dir)/lextab.py',
         '<(bindings_output_dir)/parsetab.pickle',
         '<(bindings_output_dir)/cached_jinja_templates.stamp',
         'IDLExtendedAttributes.txt',
         # If the dependency structure or public interface info (e.g.,
         # [ImplementedAs]) changes, we rebuild all files, since we're not
         # computing dependencies file-by-file in the build.
         # This data is generally stable.
-        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
+        '<(blink_output_dir)/InterfacesInfo.pickle',
         # Further, if any dependency (partial interface or implemented
         # interface) changes, rebuild everything, since every IDL potentially
         # depends on them, because we're not computing dependencies
         # file-by-file.
         # FIXME: This is too conservative, and causes excess rebuilds:
         # compute this file-by-file.  http://crbug.com/341748
         '<@(dependency_idl_files)',
       ],
       'outputs': [
         '<(bindings_output_dir)/V8<(RULE_INPUT_ROOT).cpp',
         '<(bindings_output_dir)/V8<(RULE_INPUT_ROOT).h',
       ],
       # sanitize-win-build-log.sed uses a regex which matches this command
       # line (Python script + .idl file being processed).
       # Update that regex if command line changes (other than changing flags)
       'action': [
         'python',
         '-S',  # skip 'import site' to speed up startup
         'scripts/idl_compiler.py',
         '--output-dir',
         '<(bindings_output_dir)',
         '--interfaces-info',
-        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
-        '<@(write_file_only_if_changed)',
+        '<(blink_output_dir)/InterfacesInfo.pickle',
+        '--write-file-only-if-changed',
+        '<(write_file_only_if_changed)',
         '<(RULE_INPUT_PATH)',
       ],
       'message': 'Generating binding from <(RULE_INPUT_PATH)',
     }],
   },
 ################################################################################
   {
     'target_name': 'aggregate_generated_bindings',
     'type': 'none',
     'actions': [{
@@ skipping 16 matching lines @@
       ],
       'message': 'Generating aggregate generated bindings files',
     }],
   },
 ################################################################################
   {
     'target_name': 'generated_bindings',
     'type': 'none',
     'dependencies': [
       'aggregate_generated_bindings',
-      'event_interfaces',

[Nils Barth (inactive), 2014/04/01 06:20:38]

Now 'generated_bindings' is actually just bindings!

       'individual_generated_bindings',
     ],
   },
 ################################################################################
   ],  # targets
 }