diff --git a/LICENSE b/LICENSE index 7fc997b4f04dc7..10b75c01570d4c 100644 --- 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/tools/inspector_protocol/CheckProtocolCompatibility.py b/deps/inspector_protocol/CheckProtocolCompatibility.py similarity index 100% rename from tools/inspector_protocol/CheckProtocolCompatibility.py rename to deps/inspector_protocol/CheckProtocolCompatibility.py diff --git a/tools/inspector_protocol/CodeGenerator.py b/deps/inspector_protocol/CodeGenerator.py similarity index 100% rename from tools/inspector_protocol/CodeGenerator.py rename to deps/inspector_protocol/CodeGenerator.py diff --git a/tools/inspector_protocol/ConcatenateProtocols.py b/deps/inspector_protocol/ConcatenateProtocols.py similarity index 100% rename from tools/inspector_protocol/ConcatenateProtocols.py rename to deps/inspector_protocol/ConcatenateProtocols.py diff --git a/tools/inspector_protocol/ConvertProtocolToJSON.py b/deps/inspector_protocol/ConvertProtocolToJSON.py similarity index 100% rename from tools/inspector_protocol/ConvertProtocolToJSON.py rename to deps/inspector_protocol/ConvertProtocolToJSON.py diff --git a/tools/inspector_protocol/LICENSE b/deps/inspector_protocol/LICENSE similarity index 100% rename from tools/inspector_protocol/LICENSE rename to deps/inspector_protocol/LICENSE diff --git a/tools/inspector_protocol/OWNERS b/deps/inspector_protocol/OWNERS similarity index 100% rename from tools/inspector_protocol/OWNERS rename to deps/inspector_protocol/OWNERS diff --git a/tools/inspector_protocol/README.v8 b/deps/inspector_protocol/README.v8 similarity index 100% rename from tools/inspector_protocol/README.v8 rename to deps/inspector_protocol/README.v8 diff --git a/tools/inspector_protocol/inspector_protocol.gni b/deps/inspector_protocol/inspector_protocol.gni similarity index 100% rename from tools/inspector_protocol/inspector_protocol.gni rename to deps/inspector_protocol/inspector_protocol.gni diff --git a/tools/inspector_protocol/inspector_protocol.gypi b/deps/inspector_protocol/inspector_protocol.gypi similarity index 100% rename from tools/inspector_protocol/inspector_protocol.gypi rename to deps/inspector_protocol/inspector_protocol.gypi diff --git a/tools/inspector_protocol/lib/Allocator_h.template b/deps/inspector_protocol/lib/Allocator_h.template similarity index 100% rename from tools/inspector_protocol/lib/Allocator_h.template rename to deps/inspector_protocol/lib/Allocator_h.template diff --git a/tools/inspector_protocol/lib/Array_h.template b/deps/inspector_protocol/lib/Array_h.template similarity index 100% rename from tools/inspector_protocol/lib/Array_h.template rename to deps/inspector_protocol/lib/Array_h.template diff --git a/tools/inspector_protocol/lib/Collections_h.template b/deps/inspector_protocol/lib/Collections_h.template similarity index 100% rename from tools/inspector_protocol/lib/Collections_h.template rename to deps/inspector_protocol/lib/Collections_h.template diff --git a/tools/inspector_protocol/lib/DispatcherBase_cpp.template b/deps/inspector_protocol/lib/DispatcherBase_cpp.template similarity index 100% rename from tools/inspector_protocol/lib/DispatcherBase_cpp.template rename to deps/inspector_protocol/lib/DispatcherBase_cpp.template diff --git a/tools/inspector_protocol/lib/DispatcherBase_h.template b/deps/inspector_protocol/lib/DispatcherBase_h.template similarity index 100% rename from tools/inspector_protocol/lib/DispatcherBase_h.template rename to deps/inspector_protocol/lib/DispatcherBase_h.template diff --git a/tools/inspector_protocol/lib/ErrorSupport_cpp.template b/deps/inspector_protocol/lib/ErrorSupport_cpp.template similarity index 100% rename from tools/inspector_protocol/lib/ErrorSupport_cpp.template rename to deps/inspector_protocol/lib/ErrorSupport_cpp.template diff --git a/tools/inspector_protocol/lib/ErrorSupport_h.template b/deps/inspector_protocol/lib/ErrorSupport_h.template similarity index 100% rename from tools/inspector_protocol/lib/ErrorSupport_h.template rename to deps/inspector_protocol/lib/ErrorSupport_h.template diff --git a/tools/inspector_protocol/lib/Forward_h.template b/deps/inspector_protocol/lib/Forward_h.template similarity index 100% rename from tools/inspector_protocol/lib/Forward_h.template rename to deps/inspector_protocol/lib/Forward_h.template diff --git a/tools/inspector_protocol/lib/FrontendChannel_h.template b/deps/inspector_protocol/lib/FrontendChannel_h.template similarity index 100% rename from tools/inspector_protocol/lib/FrontendChannel_h.template rename to deps/inspector_protocol/lib/FrontendChannel_h.template diff --git a/tools/inspector_protocol/lib/Maybe_h.template b/deps/inspector_protocol/lib/Maybe_h.template similarity index 100% rename from tools/inspector_protocol/lib/Maybe_h.template rename to deps/inspector_protocol/lib/Maybe_h.template diff --git a/tools/inspector_protocol/lib/Object_cpp.template b/deps/inspector_protocol/lib/Object_cpp.template similarity index 100% rename from tools/inspector_protocol/lib/Object_cpp.template rename to deps/inspector_protocol/lib/Object_cpp.template diff --git a/tools/inspector_protocol/lib/Object_h.template b/deps/inspector_protocol/lib/Object_h.template similarity index 100% rename from tools/inspector_protocol/lib/Object_h.template rename to deps/inspector_protocol/lib/Object_h.template diff --git a/tools/inspector_protocol/lib/Parser_cpp.template b/deps/inspector_protocol/lib/Parser_cpp.template similarity index 100% rename from tools/inspector_protocol/lib/Parser_cpp.template rename to deps/inspector_protocol/lib/Parser_cpp.template diff --git a/tools/inspector_protocol/lib/Parser_h.template b/deps/inspector_protocol/lib/Parser_h.template similarity index 100% rename from tools/inspector_protocol/lib/Parser_h.template rename to deps/inspector_protocol/lib/Parser_h.template diff --git a/tools/inspector_protocol/lib/Protocol_cpp.template b/deps/inspector_protocol/lib/Protocol_cpp.template similarity index 100% rename from tools/inspector_protocol/lib/Protocol_cpp.template rename to deps/inspector_protocol/lib/Protocol_cpp.template diff --git a/tools/inspector_protocol/lib/ValueConversions_h.template b/deps/inspector_protocol/lib/ValueConversions_h.template similarity index 100% rename from tools/inspector_protocol/lib/ValueConversions_h.template rename to deps/inspector_protocol/lib/ValueConversions_h.template diff --git a/tools/inspector_protocol/lib/Values_cpp.template b/deps/inspector_protocol/lib/Values_cpp.template similarity index 100% rename from tools/inspector_protocol/lib/Values_cpp.template rename to deps/inspector_protocol/lib/Values_cpp.template diff --git a/tools/inspector_protocol/lib/Values_h.template b/deps/inspector_protocol/lib/Values_h.template similarity index 100% rename from tools/inspector_protocol/lib/Values_h.template rename to deps/inspector_protocol/lib/Values_h.template diff --git a/tools/inspector_protocol/templates/Exported_h.template b/deps/inspector_protocol/templates/Exported_h.template similarity index 100% rename from tools/inspector_protocol/templates/Exported_h.template rename to deps/inspector_protocol/templates/Exported_h.template diff --git a/tools/inspector_protocol/templates/Imported_h.template b/deps/inspector_protocol/templates/Imported_h.template similarity index 100% rename from tools/inspector_protocol/templates/Imported_h.template rename to deps/inspector_protocol/templates/Imported_h.template diff --git a/tools/inspector_protocol/templates/TypeBuilder_cpp.template b/deps/inspector_protocol/templates/TypeBuilder_cpp.template similarity index 100% rename from tools/inspector_protocol/templates/TypeBuilder_cpp.template rename to deps/inspector_protocol/templates/TypeBuilder_cpp.template diff --git a/tools/inspector_protocol/templates/TypeBuilder_h.template b/deps/inspector_protocol/templates/TypeBuilder_h.template similarity index 100% rename from tools/inspector_protocol/templates/TypeBuilder_h.template rename to deps/inspector_protocol/templates/TypeBuilder_h.template diff --git a/node.gyp b/node.gyp index 8c42474bbed90a..f8fb79878e2eee 100644 --- 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 index 1dc9b5ca7d01f6..29fde514bd0229 100755 --- 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)"