Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/bindings/generated_bindings.gyp

Issue 212983010: Make EventInterfaces.in build step not depend on bindings generation (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reorder Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« Source/bindings/bindings.gypi ('K') | « Source/bindings/core_bindings_generated.gyp ('k') | Source/bindings/scripts/generate_event_interfaces.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/generated_bindings.gyp
diff --git a/Source/bindings/generated_bindings.gyp b/Source/bindings/generated_bindings.gyp
index f37887a370fa9e415b2b301c1473a3108a81d27c..dc664c4aa226a010e74652cd7d3cb381551c7b81 100644
--- a/Source/bindings/generated_bindings.gyp
+++ b/Source/bindings/generated_bindings.gyp
@@ -35,12 +35,9 @@
{
'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 scri
- '../build/scripts/scripts.gypi',
+ 'bindings.gypi',
'../core/core.gypi',
'../modules/modules.gypi',
- 'bindings.gypi',
],
'variables': {
@@ -105,19 +102,19 @@
],
'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',
],
@@ -167,23 +164,6 @@
'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': [
@@ -210,18 +190,19 @@
'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 t
+ '<(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/
],
'message': 'Generating IDL files for constructors on global objects',
}]
@@ -245,7 +226,7 @@
'<@(generated_idl_files)',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/blink/InterfacesInfo.pickle',
+ '<(blink_output_dir)/InterfacesInfo.pickle',
],
'action': [
'python',
@@ -253,8 +234,9 @@
'--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)',
@@ -264,35 +246,6 @@
},
################################################################################
{
- '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
@@ -374,7 +327,7 @@
# [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
@@ -397,8 +350,9 @@
'--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)',
@@ -435,7 +389,6 @@
'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',
],
},
« Source/bindings/bindings.gypi ('K') | « Source/bindings/core_bindings_generated.gyp ('k') | Source/bindings/scripts/generate_event_interfaces.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698