Split generate_global_constructors.py from compute_interfaces_info.py

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 56 matching lines @@
     # Paths need to be passed separately for static and generated files, as
     # static files are listed in a temporary file (b/c too long for command
     # line), but generated files must be passed at the command line, as they are
     # not present at GYP time, when the temporary file is generated
     'static_idl_files': [
       '<@(static_interface_idl_files)',
       '<@(static_dependency_idl_files)',
     ],
     'generated_idl_files': [
       '<@(generated_interface_idl_files)',
-      # FIXME: generate global constructors *before* computing dependencies
-      # '<@(generated_dependency_idl_files)',
+      '<@(generated_dependency_idl_files)',
     ],
 
     # Static IDL files
     'static_interface_idl_files': [
       '<@(core_idl_files)',
       '<@(webcore_testing_idl_files)',
       '<@(modules_idl_files)',
     ],
     'static_dependency_idl_files': [
       '<@(core_dependency_idl_files)',
       '<@(modules_dependency_idl_files)',
       '<@(modules_testing_dependency_idl_files)',
     ],
 
     # 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',
+      '<(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',
     ],
 
     # 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_compiler_files': [
       'scripts/idl_compiler.py',
@@ skipping 45 matching lines @@
       # 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',
+      'variables': {
+        # Write list of IDL files to a file, so that the command line doesn't
+        # exceed OS length limits.
+        'idl_files_list': '<|(idl_files_list.tmp <@(static_idl_files))',
+      },
+      'inputs': [
+        'scripts/generate_global_constructors.py',
+        'scripts/utilities.py',
+        '<(idl_files_list)',
+        '<@(static_idl_files)',
+      ],
+      'outputs': [
+        '<@(generated_global_constructors_idl_files)',
+      ],
+      'action': [
+        'python',
+        'scripts/generate_global_constructors.py',
+        '--idl-files-list',
+        '<(idl_files_list)',
+        '<@(write_file_only_if_changed)',
+        '--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',
+        '--serviceworkerglobalscope-constructors-file',
+        '<(SHARED_INTERMEDIATE_DIR)/ServiceWorkerGlobalScopeConstructors.idl',
+       ],
+       'message': 'Generating IDL files for constructors on global objects',
+      }]
+  },
+  {
     'target_name': 'interfaces_info',
     'type': 'none',
     'dependencies': [
+      'global_constructors_idls',
       '../core/core_generated.gyp:generated_testing_idls',
     ],
     'actions': [{
       'action_name': 'compute_interfaces_info',
       'variables': {
         # Write list of static IDL files to a file, so that the command line
         # doesn't exceed OS length limits.
         # Generated IDL files cannot be included, as their path depends on the
         # build directory, and must instead be passed as command line arguments.
         'idl_files_list': '<|(idl_files_list.tmp <@(static_idl_files))',
       },
       'inputs': [
         'scripts/compute_interfaces_info.py',
+        'scripts/utilities.py',
         '<(idl_files_list)',
         '<@(static_idl_files)',
         '<@(generated_idl_files)',
-       ],
-       'outputs': [
-         '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
-         '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
-         '<@(generated_global_constructors_idl_files)',
-         '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
-       ],
-       'action': [
-         'python',
-         'scripts/compute_interfaces_info.py',
-         '--idl-files-list',
-         '<(idl_files_list)',
-         '--interface-dependencies-file',
-         '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
-         '--interfaces-info-file',
-         '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
-         '--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',
-         '--serviceworkerglobalscope-constructors-file',
-         '<(SHARED_INTERMEDIATE_DIR)/ServiceWorkerGlobalScopeConstructors.idl',
-         '--event-names-file',
-         '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
-         '<@(write_file_only_if_changed)',
-         '--',
-         '<@(generated_idl_files)',
-       ],
-       'message': 'Computing global information about IDL files, and generating global scope constructor IDLs files and list of Event interfaces',
+      ],
+      'outputs': [
+        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
+        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
+        '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
+      ],
+      'action': [
+        'python',
+        'scripts/compute_interfaces_info.py',
+        '--idl-files-list',
+        '<(idl_files_list)',
+        '--interface-dependencies-file',
+        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
+        '--interfaces-info-file',
+        '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
+        '--event-names-file',
+        '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.in',
+        '<@(write_file_only_if_changed)',
+        '--',
+        '<@(generated_idl_files)',
+      ],
+      'message': 'Computing global information about IDL files, and generating list of Event interfaces',
       }]
     },
     {
       # A separate pre-caching step is *required* to use bytecode caching in
       # Jinja (which improves speed significantly), as the bytecode cache is
       # not concurrency-safe on write; details in code_generator_v8.py.
       'target_name': 'cached_jinja_templates',
       'type': 'none',
       'actions': [{
         'action_name': 'cache_jinja_templates',
@@ skipping 101 matching lines @@
     {
       'target_name': 'generated_bindings',
       'type': 'none',
       'dependencies': [
         'aggregate_generated_bindings',
         'individual_generated_bindings',
       ],
     },
   ],
 }