Index: Source/bindings/modules/generated.gyp |
diff --git a/Source/bindings/modules/generated.gyp b/Source/bindings/modules/generated.gyp |
index 9cbc724ce962e9c4d1f24c409147f59837e9ce09..1ec1be28d0e4a7837304f77b1afdc5d19585bdb9 100644 |
--- a/Source/bindings/modules/generated.gyp |
+++ b/Source/bindings/modules/generated.gyp |
@@ -134,11 +134,44 @@ |
}, |
################################################################################ |
{ |
+ 'target_name': 'modules_global_objects', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ '../core/generated.gyp: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', |
haraken
2014/06/05 03:05:10
Do we need GlobalObjectsCore.pickle?
Nils Barth (inactive)
2014/06/05 03:10:53
Yes: it's global objects defined in core, and is n
Nils Barth (inactive)
2014/06/05 03:23:58
For example, I'll be using it directly in the foll
|
+ '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle', |
+ ], |
+ 'message': 'Computing global objects in modules', |
+ }] |
+ }, |
+################################################################################ |
+ { |
'target_name': 'modules_global_constructors_idls', |
'type': 'none', |
'dependencies': [ |
- # FIXME: should be modules_global_objects http://crbug.com/358074 |
- '../generated.gyp:global_objects', |
+ 'modules_global_objects', |
], |
'actions': [{ |
'action_name': 'generate_modules_global_constructors_idls', |
@@ -149,7 +182,7 @@ |
# which should not appear on global objects). |
'<(modules_idl_files_list)', |
'<@(modules_idl_files)', |
- '<(bindings_output_dir)/GlobalObjects.pickle', |
+ '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle', |
], |
'outputs': [ |
'<@(modules_global_constructors_generated_idl_files)', |
@@ -161,7 +194,7 @@ |
'--idl-files-list', |
'<(modules_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)', |
'--', |