diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2019-03-31 11:50:44 +0300 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2019-04-04 17:02:23 +0300 |
| commit | 608878c95692e12a42d97f2b7cfd839453bc815d (patch) | |
| tree | 196fa613b481fe5f4c81cf282bb05a8533d2ab02 /src/inspector | |
| parent | 04355eff5bc604cb639f91d159ce21971e2c3bb4 (diff) | |
build: fix inspector dependency resolution
It was reported that parallel builds on Windows sometimes error because
of missing intermediate files.
On closer inspection I noticed that some files are copied from src/ to
the intermediate build directory in a way where they don't participate
in dependency resolution. Put another way, the build system doesn't
know to wait for the copy to complete because we don't tell it to.
Fix that by not copying around files but instead making the script that
processes them a little smarter about where to find them and where to
store the results.
PR-URL: https://github.com/nodejs/node/pull/27026
Fixes: https://github.com/nodejs/node/issues/27025
Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Diffstat (limited to 'src/inspector')
| -rw-r--r-- | src/inspector/node_inspector.gypi | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/inspector/node_inspector.gypi b/src/inspector/node_inspector.gypi index 4637263434f..d381eb91339 100644 --- a/src/inspector/node_inspector.gypi +++ b/src/inspector/node_inspector.gypi @@ -1,7 +1,6 @@ { 'variables': { 'protocol_tool_path': '../../tools/inspector_protocol', - 'node_inspector_path': '../../src/inspector', 'node_inspector_generated_sources': [ '<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h', '<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Protocol.cpp', @@ -67,23 +66,14 @@ '<(SHARED_INTERMEDIATE_DIR)', '<(SHARED_INTERMEDIATE_DIR)/src', # for inspector ], - 'copies': [ - { - 'files': [ - '<(node_inspector_path)/node_protocol_config.json', - '<(node_inspector_path)/node_protocol.pdl' - ], - 'destination': '<(SHARED_INTERMEDIATE_DIR)', - } - ], 'actions': [ { 'action_name': 'convert_node_protocol_to_json', 'inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_protocol.pdl', + 'node_protocol.pdl', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_protocol.json', + '<(SHARED_INTERMEDIATE_DIR)/src/node_protocol.json', ], 'action': [ 'python', @@ -95,8 +85,8 @@ { 'action_name': 'node_protocol_generated_sources', 'inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json', - '<(SHARED_INTERMEDIATE_DIR)/node_protocol.json', + 'node_protocol_config.json', + '<(SHARED_INTERMEDIATE_DIR)/src/node_protocol.json', '<@(node_protocol_files)', ], 'outputs': [ @@ -108,7 +98,7 @@ 'tools/inspector_protocol/code_generator.py', '--jinja_dir', '<@(protocol_tool_path)/..', '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/', - '--config', '<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json', + '--config', 'src/inspector/node_protocol_config.json', ], 'message': 'Generating node protocol sources from protocol json', }, @@ -116,7 +106,7 @@ 'action_name': 'concatenate_protocols', 'inputs': [ '../../deps/v8/src/inspector/js_protocol.pdl', - '<(SHARED_INTERMEDIATE_DIR)/node_protocol.json', + '<(SHARED_INTERMEDIATE_DIR)/src/node_protocol.json', ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json', |