nodejs · addaleax · Aug 20, 2018 · Aug 20, 2018
diff --git a/LICENSE b/LICENSE
@@ -1035,7 +1035,7 @@ The externally maintained libraries used by Node.js are:
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   """
 
-- inspector_protocol, located at tools/inspector_protocol, is licensed as follows:
+- inspector_protocol, located at deps/inspector_protocol, is licensed as follows:
   """
     // Copyright 2016 The Chromium Authors. All rights reserved.
     //

diff --git a/...or_protocol/CheckProtocolCompatibility.py → ...or_protocol/CheckProtocolCompatibility.py b/...or_protocol/CheckProtocolCompatibility.py → ...or_protocol/CheckProtocolCompatibility.py
diff --git a/tools/inspector_protocol/CodeGenerator.py → deps/inspector_protocol/CodeGenerator.py b/tools/inspector_protocol/CodeGenerator.py → deps/inspector_protocol/CodeGenerator.py
diff --git a/...nspector_protocol/ConcatenateProtocols.py → ...nspector_protocol/ConcatenateProtocols.py b/...nspector_protocol/ConcatenateProtocols.py → ...nspector_protocol/ConcatenateProtocols.py
diff --git a/...spector_protocol/ConvertProtocolToJSON.py → ...spector_protocol/ConvertProtocolToJSON.py b/...spector_protocol/ConvertProtocolToJSON.py → ...spector_protocol/ConvertProtocolToJSON.py
diff --git a/tools/inspector_protocol/LICENSE → deps/inspector_protocol/LICENSE b/tools/inspector_protocol/LICENSE → deps/inspector_protocol/LICENSE
diff --git a/tools/inspector_protocol/OWNERS → deps/inspector_protocol/OWNERS b/tools/inspector_protocol/OWNERS → deps/inspector_protocol/OWNERS
diff --git a/tools/inspector_protocol/README.v8 → deps/inspector_protocol/README.v8 b/tools/inspector_protocol/README.v8 → deps/inspector_protocol/README.v8
diff --git a/...inspector_protocol/inspector_protocol.gni → ...inspector_protocol/inspector_protocol.gni b/...inspector_protocol/inspector_protocol.gni → ...inspector_protocol/inspector_protocol.gni
diff --git a/...nspector_protocol/inspector_protocol.gypi → ...nspector_protocol/inspector_protocol.gypi b/...nspector_protocol/inspector_protocol.gypi → ...nspector_protocol/inspector_protocol.gypi
diff --git a/...spector_protocol/lib/Allocator_h.template → ...spector_protocol/lib/Allocator_h.template b/...spector_protocol/lib/Allocator_h.template → ...spector_protocol/lib/Allocator_h.template
diff --git a/...s/inspector_protocol/lib/Array_h.template → deps/inspector_protocol/lib/Array_h.template b/...s/inspector_protocol/lib/Array_h.template → deps/inspector_protocol/lib/Array_h.template
diff --git a/...ector_protocol/lib/Collections_h.template → ...ector_protocol/lib/Collections_h.template b/...ector_protocol/lib/Collections_h.template → ...ector_protocol/lib/Collections_h.template
diff --git a/..._protocol/lib/DispatcherBase_cpp.template → ..._protocol/lib/DispatcherBase_cpp.template b/..._protocol/lib/DispatcherBase_cpp.template → ..._protocol/lib/DispatcherBase_cpp.template
diff --git a/...or_protocol/lib/DispatcherBase_h.template → ...or_protocol/lib/DispatcherBase_h.template b/...or_protocol/lib/DispatcherBase_h.template → ...or_protocol/lib/DispatcherBase_h.template
diff --git a/...or_protocol/lib/ErrorSupport_cpp.template → ...or_protocol/lib/ErrorSupport_cpp.template b/...or_protocol/lib/ErrorSupport_cpp.template → ...or_protocol/lib/ErrorSupport_cpp.template
diff --git a/...ctor_protocol/lib/ErrorSupport_h.template → ...ctor_protocol/lib/ErrorSupport_h.template b/...ctor_protocol/lib/ErrorSupport_h.template → ...ctor_protocol/lib/ErrorSupport_h.template
diff --git a/...inspector_protocol/lib/Forward_h.template → ...inspector_protocol/lib/Forward_h.template b/...inspector_protocol/lib/Forward_h.template → ...inspector_protocol/lib/Forward_h.template
diff --git a/...r_protocol/lib/FrontendChannel_h.template → ...r_protocol/lib/FrontendChannel_h.template b/...r_protocol/lib/FrontendChannel_h.template → ...r_protocol/lib/FrontendChannel_h.template
diff --git a/...s/inspector_protocol/lib/Maybe_h.template → deps/inspector_protocol/lib/Maybe_h.template b/...s/inspector_protocol/lib/Maybe_h.template → deps/inspector_protocol/lib/Maybe_h.template
diff --git a/...nspector_protocol/lib/Object_cpp.template → ...nspector_protocol/lib/Object_cpp.template b/...nspector_protocol/lib/Object_cpp.template → ...nspector_protocol/lib/Object_cpp.template
diff --git a/.../inspector_protocol/lib/Object_h.template → .../inspector_protocol/lib/Object_h.template b/.../inspector_protocol/lib/Object_h.template → .../inspector_protocol/lib/Object_h.template
diff --git a/...nspector_protocol/lib/Parser_cpp.template → ...nspector_protocol/lib/Parser_cpp.template b/...nspector_protocol/lib/Parser_cpp.template → ...nspector_protocol/lib/Parser_cpp.template
diff --git a/.../inspector_protocol/lib/Parser_h.template → .../inspector_protocol/lib/Parser_h.template b/.../inspector_protocol/lib/Parser_h.template → .../inspector_protocol/lib/Parser_h.template
diff --git a/...pector_protocol/lib/Protocol_cpp.template → ...pector_protocol/lib/Protocol_cpp.template b/...pector_protocol/lib/Protocol_cpp.template → ...pector_protocol/lib/Protocol_cpp.template
diff --git a/..._protocol/lib/ValueConversions_h.template → ..._protocol/lib/ValueConversions_h.template b/..._protocol/lib/ValueConversions_h.template → ..._protocol/lib/ValueConversions_h.template
diff --git a/...nspector_protocol/lib/Values_cpp.template → ...nspector_protocol/lib/Values_cpp.template b/...nspector_protocol/lib/Values_cpp.template → ...nspector_protocol/lib/Values_cpp.template
diff --git a/.../inspector_protocol/lib/Values_h.template → .../inspector_protocol/lib/Values_h.template b/.../inspector_protocol/lib/Values_h.template → .../inspector_protocol/lib/Values_h.template
diff --git a/...or_protocol/templates/Exported_h.template → ...or_protocol/templates/Exported_h.template b/...or_protocol/templates/Exported_h.template → ...or_protocol/templates/Exported_h.template
diff --git a/...or_protocol/templates/Imported_h.template → ...or_protocol/templates/Imported_h.template b/...or_protocol/templates/Imported_h.template → ...or_protocol/templates/Imported_h.template
diff --git a/...otocol/templates/TypeBuilder_cpp.template → ...otocol/templates/TypeBuilder_cpp.template b/...otocol/templates/TypeBuilder_cpp.template → ...otocol/templates/TypeBuilder_cpp.template
diff --git a/...protocol/templates/TypeBuilder_h.template → ...protocol/templates/TypeBuilder_h.template b/...protocol/templates/TypeBuilder_h.template → ...protocol/templates/TypeBuilder_h.template
diff --git a/node.gyp b/node.gyp
@@ -1045,7 +1045,7 @@
     }], # end aix section
     [ 'v8_enable_inspector==1', {
       'variables': {
-        'protocol_path': 'tools/inspector_protocol',
+        'protocol_path': 'deps/inspector_protocol',
         'node_inspector_path': 'src/inspector',
         'node_inspector_generated_sources': [
           '<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h',
@@ -1105,7 +1105,7 @@
               ],
               'action': [
                 'python',
-                'tools/inspector_protocol/ConvertProtocolToJSON.py',
+                'deps/inspector_protocol/ConvertProtocolToJSON.py',
                 '<@(_inputs)',
                 '<@(_outputs)',
               ],
@@ -1131,7 +1131,7 @@
               'action': [
                 'python',
                 '<(protocol_path)/CodeGenerator.py',
-                '--jinja_dir', '<@(protocol_path)/..',
+                '--jinja_dir', 'tools/jinja2',
                 '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
                 '--config', '<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json',
               ],
@@ -1160,7 +1160,7 @@
               ],
               'action': [
                 'python',
-                'tools/inspector_protocol/ConvertProtocolToJSON.py',
+                'deps/inspector_protocol/ConvertProtocolToJSON.py',
                 '<@(_inputs)',
                 '<@(_outputs)',
               ],
@@ -1176,7 +1176,7 @@
               ],
               'action': [
                 'python',
-                'tools/inspector_protocol/ConcatenateProtocols.py',
+                'deps/inspector_protocol/ConcatenateProtocols.py',
                 '<@(_inputs)',
                 '<@(_outputs)',
               ],

diff --git a/tools/license-builder.sh b/tools/license-builder.sh
@@ -71,7 +71,7 @@ addlicense "npm" "deps/npm" "$(cat ${rootdir}/deps/npm/LICENSE)"
 
 # Build tools
 addlicense "GYP" "tools/gyp" "$(cat ${rootdir}/tools/gyp/LICENSE)"
-addlicense "inspector_protocol" "tools/inspector_protocol" "$(cat ${rootdir}/tools/inspector_protocol/LICENSE)"
+addlicense "inspector_protocol" "deps/inspector_protocol" "$(cat ${rootdir}/deps/inspector_protocol/LICENSE)"
 addlicense "jinja2" "tools/jinja2" "$(cat ${rootdir}/tools/jinja2/LICENSE)"
 addlicense "markupsafe" "tools/markupsafe" "$(cat ${rootdir}/tools/markupsafe/LICENSE)"