Skip to content

GitLab

T
tangled
Commit 6d0ceef9 authored by nbarth@chromium.org's avatar nbarth@chromium.org
Browse files
Options

IDL build: remove dependency core global constructors → modules global objects 

Moves "constructors on modules global objects from core interfaces" to modules.
I.e., moves ServiceWorkerGlobalScopeCore.idl from
gen/blink/core to gen/blink/modules

bindings/core/generated.gyp no longer references modules!

R=haraken
BUG=358074

Review URL: https://codereview.chromium.org/319593006

git-svn-id: svn://svn.chromium.org/blink/trunk@175631 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 6b63b401
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 51 deletions
third_party/WebKit/Source/bindings/core/generated.gyp
View file @ 6d0ceef9
...@@ -10,10 +10,6 @@ ...@@ -10,10 +10,6 @@
'includes': [ 'includes': [
# ../.. == Source # ../.. == Source
'../../bindings/bindings.gypi', '../../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', '../../bindings/scripts/scripts.gypi',
'../../core/core.gypi', '../../core/core.gypi',
'core.gypi', 'core.gypi',
...@@ -27,7 +23,7 @@ ...@@ -27,7 +23,7 @@
'target_name': 'core_global_objects', 'target_name': 'core_global_objects',
'type': 'none', 'type': 'none',
'actions': [{ 'actions': [{
'action_name': 'core_modules_global_objects', 'action_name': 'compute_core_global_objects',
'inputs': [ 'inputs': [
'<(bindings_scripts_dir)/compute_global_objects.py', '<(bindings_scripts_dir)/compute_global_objects.py',
'<(bindings_scripts_dir)/utilities.py', '<(bindings_scripts_dir)/utilities.py',
...@@ -52,48 +48,12 @@ ...@@ -52,48 +48,12 @@
'message': 'Computing global objects in core', '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', 'target_name': 'core_global_constructors_idls',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
# FIXME: should be core_global_objects http://crbug.com/358074 'core_global_objects',
'modules_global_objects',
], ],
'actions': [{ 'actions': [{
'action_name': 'generate_core_global_constructors_idls', 'action_name': 'generate_core_global_constructors_idls',
...@@ -104,7 +64,7 @@ ...@@ -104,7 +64,7 @@
# which should not appear on global objects). # which should not appear on global objects).
'<(core_idl_files_list)', '<(core_idl_files_list)',
'<@(core_idl_files)', '<@(core_idl_files)',
'<(bindings_modules_output_dir)/GlobalObjectsModules.pickle', '<(bindings_core_output_dir)/GlobalObjectsCore.pickle',
], ],
'outputs': [ 'outputs': [
'<@(core_global_constructors_generated_idl_files)', '<@(core_global_constructors_generated_idl_files)',
...@@ -116,7 +76,7 @@ ...@@ -116,7 +76,7 @@
'--idl-files-list', '--idl-files-list',
'<(core_idl_files_list)', '<(core_idl_files_list)',
'--global-objects-file', '--global-objects-file',
'<(bindings_modules_output_dir)/GlobalObjectsModules.pickle', '<(bindings_core_output_dir)/GlobalObjectsCore.pickle',
'--write-file-only-if-changed', '--write-file-only-if-changed',
'<(write_file_only_if_changed)', '<(write_file_only_if_changed)',
'--', '--',
...@@ -126,8 +86,6 @@ ...@@ -126,8 +86,6 @@
'<(blink_core_output_dir)/SharedWorkerGlobalScopeCoreConstructors.idl', '<(blink_core_output_dir)/SharedWorkerGlobalScopeCoreConstructors.idl',
'DedicatedWorkerGlobalScope', 'DedicatedWorkerGlobalScope',
'<(blink_core_output_dir)/DedicatedWorkerGlobalScopeCoreConstructors.idl', '<(blink_core_output_dir)/DedicatedWorkerGlobalScopeCoreConstructors.idl',
'ServiceWorkerGlobalScope',
'<(blink_core_output_dir)/ServiceWorkerGlobalScopeCoreConstructors.idl',
], ],
'message': 'message':
'Generating IDL files for constructors on global objects from core', 'Generating IDL files for constructors on global objects from core',
......
third_party/WebKit/Source/bindings/core/generated.gypi
View file @ 6d0ceef9
...@@ -13,14 +13,12 @@ ...@@ -13,14 +13,12 @@
'<(blink_core_output_dir)/WindowCoreConstructors.idl', '<(blink_core_output_dir)/WindowCoreConstructors.idl',
'<(blink_core_output_dir)/SharedWorkerGlobalScopeCoreConstructors.idl', '<(blink_core_output_dir)/SharedWorkerGlobalScopeCoreConstructors.idl',
'<(blink_core_output_dir)/DedicatedWorkerGlobalScopeCoreConstructors.idl', '<(blink_core_output_dir)/DedicatedWorkerGlobalScopeCoreConstructors.idl',
'<(blink_core_output_dir)/ServiceWorkerGlobalScopeCoreConstructors.idl',
], ],
'core_global_constructors_generated_header_files': [ 'core_global_constructors_generated_header_files': [
'<(blink_core_output_dir)/WindowCoreConstructors.h', '<(blink_core_output_dir)/WindowCoreConstructors.h',
'<(blink_core_output_dir)/SharedWorkerGlobalScopeCoreConstructors.h', '<(blink_core_output_dir)/SharedWorkerGlobalScopeCoreConstructors.h',
'<(blink_core_output_dir)/DedicatedWorkerGlobalScopeCoreConstructors.h', '<(blink_core_output_dir)/DedicatedWorkerGlobalScopeCoreConstructors.h',
'<(blink_core_output_dir)/ServiceWorkerGlobalScopeCoreConstructors.h',
], ],
}, },
} }
third_party/WebKit/Source/bindings/modules/generated.gyp
View file @ 6d0ceef9
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
'targets': [ 'targets': [
################################################################################ ################################################################################
{ {
# FIXME: Should be in modules, not bindings_modules http://crbug.com/358074
'target_name': 'modules_event_generated', 'target_name': 'modules_event_generated',
'type': 'none', 'type': 'none',
'actions': [ 'actions': [
...@@ -41,7 +42,6 @@ ...@@ -41,7 +42,6 @@
'<@(event_idl_files)', '<@(event_idl_files)',
], ],
'outputs': [ 'outputs': [
# FIXME: should output to bindings_modules_output_dir http://crbug.com/358074
'<(blink_modules_output_dir)/EventModulesInterfaces.in', '<(blink_modules_output_dir)/EventModulesInterfaces.in',
], ],
'action': [ 'action': [
...@@ -132,12 +132,87 @@ ...@@ -132,12 +132,87 @@
}, },
], ],
}, },
################################################################################
{
'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',
'<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
],
'message': 'Computing global objects in modules',
}]
},
################################################################################
{
# Global constructors for global objects in modules (ServiceWorker)
# but interfaces in core.
'target_name': 'modules_core_global_constructors_idls',
'type': 'none',
'dependencies': [
'modules_global_objects',
],
'actions': [{
'action_name': 'generate_modules_core_global_constructors_idls',
'inputs': [
'<(bindings_scripts_dir)/generate_global_constructors.py',
'<(bindings_scripts_dir)/utilities.py',
# Only includes main IDL files (exclude dependencies and testing,
# which should not appear on global objects).
'<(core_idl_files_list)',
'<@(core_idl_files)',
'<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
],
'outputs': [
'<@(modules_core_global_constructors_generated_idl_files)',
'<@(modules_core_global_constructors_generated_header_files)',
],
'action': [
'python',
'<(bindings_scripts_dir)/generate_global_constructors.py',
'--idl-files-list',
'<(core_idl_files_list)',
'--global-objects-file',
'<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
'--write-file-only-if-changed',
'<(write_file_only_if_changed)',
'--',
'ServiceWorkerGlobalScope',
'<(blink_modules_output_dir)/ServiceWorkerGlobalScopeCoreConstructors.idl',
],
'message':
'Generating IDL files for constructors for interfaces in core, on global objects from modules',
}]
},
################################################################################ ################################################################################
{ {
'target_name': 'modules_global_constructors_idls', 'target_name': 'modules_global_constructors_idls',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'../core/generated.gyp:modules_global_objects', 'modules_global_objects',
], ],
'actions': [{ 'actions': [{
'action_name': 'generate_modules_global_constructors_idls', 'action_name': 'generate_modules_global_constructors_idls',
...@@ -182,6 +257,7 @@ ...@@ -182,6 +257,7 @@
'target_name': 'interfaces_info_individual_modules', 'target_name': 'interfaces_info_individual_modules',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'modules_core_global_constructors_idls',
'modules_global_constructors_idls', 'modules_global_constructors_idls',
], ],
'actions': [{ 'actions': [{
......
third_party/WebKit/Source/bindings/modules/generated.gypi
View file @ 6d0ceef9
...@@ -9,13 +9,21 @@ ...@@ -9,13 +9,21 @@
'variables': { 'variables': {
# Global constructors # Global constructors
# Global object in modules, constructors for interfaces in core
'modules_core_global_constructors_generated_idl_files': [
'<(blink_modules_output_dir)/ServiceWorkerGlobalScopeCoreConstructors.idl',
],
'modules_core_global_constructors_generated_header_files': [
'<(blink_modules_output_dir)/ServiceWorkerGlobalScopeCoreConstructors.h',
],
# Global object in modules, constructors for interfaces in modules
'modules_global_constructors_generated_idl_files': [ 'modules_global_constructors_generated_idl_files': [
'<(blink_modules_output_dir)/WindowModulesConstructors.idl', '<(blink_modules_output_dir)/WindowModulesConstructors.idl',
'<(blink_modules_output_dir)/SharedWorkerGlobalScopeModulesConstructors.idl', '<(blink_modules_output_dir)/SharedWorkerGlobalScopeModulesConstructors.idl',
'<(blink_modules_output_dir)/DedicatedWorkerGlobalScopeModulesConstructors.idl', '<(blink_modules_output_dir)/DedicatedWorkerGlobalScopeModulesConstructors.idl',
'<(blink_modules_output_dir)/ServiceWorkerGlobalScopeModulesConstructors.idl', '<(blink_modules_output_dir)/ServiceWorkerGlobalScopeModulesConstructors.idl',
], ],
'modules_global_constructors_generated_header_files': [ 'modules_global_constructors_generated_header_files': [
'<(blink_modules_output_dir)/WindowModulesConstructors.h', '<(blink_modules_output_dir)/WindowModulesConstructors.h',
'<(blink_modules_output_dir)/SharedWorkerGlobalScopeModulesConstructors.h', '<(blink_modules_output_dir)/SharedWorkerGlobalScopeModulesConstructors.h',
......
third_party/WebKit/Source/bindings/modules/idl.gypi
View file @ 6d0ceef9
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
# Generated IDL files # Generated IDL files
'modules_generated_dependency_idl_files': [ 'modules_generated_dependency_idl_files': [
'<@(modules_core_global_constructors_generated_idl_files)', # partial interfaces
'<@(modules_global_constructors_generated_idl_files)', # partial interfaces '<@(modules_global_constructors_generated_idl_files)', # partial interfaces
], ],
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment