build,v8: fix gyp target race

Merge `protocol_generated_sources` & `inspector_injected_script#target` into serial actions in the same target
nodejs · Sep 4, 2018 · a9d644c · a9d644c
1 parent e9aef43
commit a9d644c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 36 deletions.
diff --git a/common.gypi b/common.gypi
@@ -29,7 +29,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.26',
+    'v8_embedder_string': '-node.27',
 
     # Enable disassembler for `--print-code` v8 options
     'v8_enable_disassembler': 1,

diff --git a/deps/v8/gypfiles/inspector.gyp b/deps/v8/gypfiles/inspector.gyp
@@ -14,32 +14,6 @@
   'targets': [
     { 'target_name': 'inspector_injected_script',
       'type': 'none',
-      'toolsets': ['target'],
-      'actions': [
-        {
-          'action_name': 'convert_js_to_cpp_char_array',
-          'inputs': [
-            '<(inspector_path)/build/xxd.py',
-            '<(inspector_injected_script_source)',
-          ],
-          'outputs': [
-            '<(inspector_generated_injected_script)',
-          ],
-          'action': [
-            'python',
-            '<(inspector_path)/build/xxd.py',
-            'InjectedScriptSource_js',
-            '<(inspector_path)/injected-script-source.js',
-            '<@(_outputs)'
-          ],
-        },
-      ],
-      # Since this target generates header files, it needs to be a hard dependency.
-      'hard_dependency': 1,
-    },
-    { 'target_name': 'protocol_compatibility',
-      'type': 'none',
-      'toolsets': ['target'],
       'actions': [
         {
           'action_name': 'protocol_compatibility',
@@ -55,15 +29,8 @@
             '--stamp', '<@(_outputs)',
             '<(inspector_path)/js_protocol.json',
           ],
-          'message': 'Generating inspector protocol sources from protocol json definition',
+          'message': 'Checking inspector protocol compatibility',
         },
-      ]
-    },
-    { 'target_name': 'protocol_generated_sources',
-      'type': 'none',
-      'dependencies': [ 'protocol_compatibility' ],
-      'toolsets': ['target'],
-      'actions': [
         {
           'action_name': 'protocol_generated_sources',
           'inputs': [
@@ -83,6 +50,23 @@
           ],
           'message': 'Generating inspector protocol sources from protocol json',
         },
+        {
+          'action_name': 'convert_js_to_cpp_char_array',
+          'inputs': [
+            '<(inspector_path)/build/xxd.py',
+            '<(inspector_injected_script_source)',
+          ],
+          'outputs': [
+            '<(inspector_generated_injected_script)',
+          ],
+          'action': [
+            'python',
+            '<(inspector_path)/build/xxd.py',
+            'InjectedScriptSource_js',
+            '<(inspector_path)/injected-script-source.js',
+            '<@(_outputs)'
+          ],
+        },
       ]
     },
   ],

diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
@@ -518,7 +518,6 @@
         'v8_libbase',
         'v8_libsampler',
         'v8_torque#host',
-        'inspector.gyp:protocol_generated_sources#target',
         'inspector.gyp:inspector_injected_script#target',
       ],
       'direct_dependent_settings': {