IDL build: Split global object computation into core and modules

Source/bindings/core/generated.gyp

Index: Source/bindings/core/generated.gyp
diff --git a/Source/bindings/core/generated.gyp b/Source/bindings/core/generated.gyp
index bfaeb845fa1b8c27bac00107b9c595110ed8c59e..a1b1e4168af6ae2791ede67ffa1774a0cfa00d43 100644
--- a/Source/bindings/core/generated.gyp
+++ b/Source/bindings/core/generated.gyp
@@ -10,6 +10,10 @@
   'includes': [
     # ../.. == Source
     '../../bindings/bindings.gypi',
+    # FIXME: need info about modules for constructors on global objects
+    # http://crbug.com/358074
+    '../../bindings/modules/idl.gypi',
+    '../../bindings/modules/modules.gypi',
     '../../bindings/scripts/scripts.gypi',
     '../../core/core.gypi',
     'core.gypi',
@@ -20,11 +24,76 @@
   'targets': [
 ################################################################################
   {
+    'target_name': 'core_global_objects',
+    'type': 'none',
+    'actions': [{
+      'action_name': 'core_modules_global_objects',
+      'inputs': [
+        '<(bindings_scripts_dir)/compute_global_objects.py',
+        '<(bindings_scripts_dir)/utilities.py',
+        # Only look in main IDL files (exclude dependencies and testing,
+        # which should not define global objects).
+        '<(core_idl_files_list)',
+        '<@(core_idl_files)',
+      ],
+      'outputs': [
+        '<(bindings_core_output_dir)/GlobalObjectsCore.pickle',
+      ],
+      'action': [
+        'python',
+        '<(bindings_scripts_dir)/compute_global_objects.py',
+        '--idl-files-list',
+        '<(core_idl_files_list)',
+        '--write-file-only-if-changed',
+        '<(write_file_only_if_changed)',
+        '--',
+        '<(bindings_core_output_dir)/GlobalObjectsCore.pickle',
+       ],
+       'message': 'Computing global objects in core',
+      }]
+  },
+################################################################################
+  {
+    # FIXME: should be in modules/generated.gyp http://crbug.com/358074
+    'target_name': 'modules_global_objects',
+    'type': 'none',
+    'dependencies': [
+        'core_global_objects',
+    ],
+    'actions': [{
+      'action_name': 'compute_modules_global_objects',
+      'inputs': [
+        '<(bindings_scripts_dir)/compute_global_objects.py',
+        '<(bindings_scripts_dir)/utilities.py',
+        # Only look in main IDL files (exclude dependencies and testing,
+        # which should not define global objects).
+        '<(modules_idl_files_list)',
+        '<@(modules_idl_files)',
+      ],
+      'outputs': [
+        '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
+      ],
+      'action': [
+        'python',
+        '<(bindings_scripts_dir)/compute_global_objects.py',
+        '--idl-files-list',
+        '<(modules_idl_files_list)',
+        '--write-file-only-if-changed',
+        '<(write_file_only_if_changed)',
+        '--',
+        '<(bindings_core_output_dir)/GlobalObjectsCore.pickle',
+        '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
+       ],
+       'message': 'Computing global objects in modules',
+      }]
+  },
+################################################################################
+  {
     'target_name': 'core_global_constructors_idls',
     'type': 'none',
     'dependencies': [
         # FIXME: should be core_global_objects http://crbug.com/358074
-        '../generated.gyp:global_objects',
+        'modules_global_objects',
     ],
     'actions': [{
       'action_name': 'generate_core_global_constructors_idls',
@@ -35,7 +104,7 @@
         # which should not appear on global objects).
         '<(core_idl_files_list)',
         '<@(core_idl_files)',
-        '<(bindings_output_dir)/GlobalObjects.pickle',
+        '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
       ],
       'outputs': [
         '<@(core_global_constructors_generated_idl_files)',
@@ -47,7 +116,7 @@
         '--idl-files-list',
         '<(core_idl_files_list)',
         '--global-objects-file',
-        '<(bindings_output_dir)/GlobalObjects.pickle',
+        '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
         '--write-file-only-if-changed',
         '<(write_file_only_if_changed)',
         '--',