Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a48430d

Browse filesBrowse files
legendecasaduh95
legendecas
authored and
aduh95
committed
deps: move inspector_protocol to deps
The `crdtp` library in the inspector_protocol is compiled as a library and linked to the node executable. PR-URL: #56649 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent 9f1fa19 commit a48430d
Copy full SHA for a48430d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

75 files changed

+84
-4799
lines changed

‎LICENSE

Copy file name to clipboardExpand all lines: LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2098,7 +2098,7 @@ The externally maintained libraries used by Node.js are:
20982098
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
20992099
"""
21002100

2101-
- inspector_protocol, located at tools/inspector_protocol, is licensed as follows:
2101+
- inspector_protocol, located at deps/inspector_protocol, is licensed as follows:
21022102
"""
21032103
// Copyright 2016 The Chromium Authors. All rights reserved.
21042104
//

‎tools/inspector_protocol/BUILD.gn renamed to ‎deps/inspector_protocol/BUILD.gn

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/LICENSE renamed to ‎deps/inspector_protocol/LICENSE

Copy file name to clipboard
File renamed without changes.

‎deps/inspector_protocol/README.md

Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions

‎tools/inspector_protocol/README.node renamed to ‎deps/inspector_protocol/README.node

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/check_protocol_compatibility.py renamed to ‎deps/inspector_protocol/check_protocol_compatibility.py

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/code_generator.py renamed to ‎deps/inspector_protocol/code_generator.py

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/concatenate_protocols.py renamed to ‎deps/inspector_protocol/concatenate_protocols.py

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/convert_protocol_to_json.py renamed to ‎deps/inspector_protocol/convert_protocol_to_json.py

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/README.md renamed to ‎deps/inspector_protocol/crdtp/README.md

Copy file name to clipboard

‎tools/inspector_protocol/crdtp/cbor.cc renamed to ‎deps/inspector_protocol/crdtp/cbor.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/cbor.h renamed to ‎deps/inspector_protocol/crdtp/cbor.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/cbor_test.cc renamed to ‎deps/inspector_protocol/crdtp/cbor_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/dispatch.cc renamed to ‎deps/inspector_protocol/crdtp/dispatch.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/dispatch.h renamed to ‎deps/inspector_protocol/crdtp/dispatch.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/dispatch_test.cc renamed to ‎deps/inspector_protocol/crdtp/dispatch_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/error_support.cc renamed to ‎deps/inspector_protocol/crdtp/error_support.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/error_support.h renamed to ‎deps/inspector_protocol/crdtp/error_support.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/error_support_test.cc renamed to ‎deps/inspector_protocol/crdtp/error_support_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/export.h renamed to ‎deps/inspector_protocol/crdtp/export.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/find_by_first.h renamed to ‎deps/inspector_protocol/crdtp/find_by_first.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/find_by_first_test.cc renamed to ‎deps/inspector_protocol/crdtp/find_by_first_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/frontend_channel.h renamed to ‎deps/inspector_protocol/crdtp/frontend_channel.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/json.cc renamed to ‎deps/inspector_protocol/crdtp/json.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/json.h renamed to ‎deps/inspector_protocol/crdtp/json.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/json_platform.cc renamed to ‎deps/inspector_protocol/crdtp/json_platform.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/json_platform.h renamed to ‎deps/inspector_protocol/crdtp/json_platform.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/json_test.cc renamed to ‎deps/inspector_protocol/crdtp/json_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/maybe.h renamed to ‎deps/inspector_protocol/crdtp/maybe.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/maybe_test.cc renamed to ‎deps/inspector_protocol/crdtp/maybe_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/parser_handler.h renamed to ‎deps/inspector_protocol/crdtp/parser_handler.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/protocol_core.cc renamed to ‎deps/inspector_protocol/crdtp/protocol_core.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/protocol_core.h renamed to ‎deps/inspector_protocol/crdtp/protocol_core.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/protocol_core_test.cc renamed to ‎deps/inspector_protocol/crdtp/protocol_core_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/serializable.cc renamed to ‎deps/inspector_protocol/crdtp/serializable.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/serializable.h renamed to ‎deps/inspector_protocol/crdtp/serializable.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/serializable_test.cc renamed to ‎deps/inspector_protocol/crdtp/serializable_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/span.cc renamed to ‎deps/inspector_protocol/crdtp/span.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/span.h renamed to ‎deps/inspector_protocol/crdtp/span.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/span_test.cc renamed to ‎deps/inspector_protocol/crdtp/span_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/status.cc renamed to ‎deps/inspector_protocol/crdtp/status.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/status.h renamed to ‎deps/inspector_protocol/crdtp/status.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/status_test.cc renamed to ‎deps/inspector_protocol/crdtp/status_test.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/status_test_support.cc renamed to ‎deps/inspector_protocol/crdtp/status_test_support.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/status_test_support.h renamed to ‎deps/inspector_protocol/crdtp/status_test_support.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/test_platform.cc renamed to ‎deps/inspector_protocol/crdtp/test_platform.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/test_platform.h renamed to ‎deps/inspector_protocol/crdtp/test_platform.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/test_string_traits.cc renamed to ‎deps/inspector_protocol/crdtp/test_string_traits.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/test_string_traits.h renamed to ‎deps/inspector_protocol/crdtp/test_string_traits.h

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/crdtp/transcode.cc renamed to ‎deps/inspector_protocol/crdtp/transcode.cc

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/inspector_protocol.gni renamed to ‎deps/inspector_protocol/inspector_protocol.gni

Copy file name to clipboard
File renamed without changes.

‎deps/inspector_protocol/inspector_protocol.gyp

Copy file name to clipboard
+43Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
'variables': {
3+
'crdtp_sources': [
4+
'crdtp/cbor.cc',
5+
'crdtp/cbor.h',
6+
'crdtp/dispatch.cc',
7+
'crdtp/dispatch.h',
8+
'crdtp/error_support.cc',
9+
'crdtp/error_support.h',
10+
'crdtp/export.h',
11+
'crdtp/find_by_first.h',
12+
'crdtp/frontend_channel.h',
13+
'crdtp/json.cc',
14+
'crdtp/json.h',
15+
'crdtp/json_platform.cc',
16+
'crdtp/json_platform.h',
17+
'crdtp/maybe.h',
18+
'crdtp/parser_handler.h',
19+
'crdtp/protocol_core.cc',
20+
'crdtp/protocol_core.h',
21+
'crdtp/serializable.cc',
22+
'crdtp/serializable.h',
23+
'crdtp/span.cc',
24+
'crdtp/span.h',
25+
'crdtp/status.cc',
26+
'crdtp/status.h',
27+
]
28+
},
29+
'targets': [
30+
{
31+
'target_name': 'crdtp',
32+
'type': 'static_library',
33+
'include_dirs': [ '.' ],
34+
'direct_dependent_settings': {
35+
# Use like `#include "crdtp/json.h"`
36+
'include_dirs': [ '.' ],
37+
},
38+
'sources': [
39+
'<@(crdtp_sources)',
40+
],
41+
},
42+
]
43+
}

‎tools/inspector_protocol/lib/Forward_h.template renamed to ‎deps/inspector_protocol/lib/Forward_h.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/lib/Object_cpp.template renamed to ‎deps/inspector_protocol/lib/Object_cpp.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/lib/Object_h.template renamed to ‎deps/inspector_protocol/lib/Object_h.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/lib/Protocol_cpp.template renamed to ‎deps/inspector_protocol/lib/Protocol_cpp.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/lib/ValueConversions_cpp.template renamed to ‎deps/inspector_protocol/lib/ValueConversions_cpp.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/lib/ValueConversions_h.template renamed to ‎deps/inspector_protocol/lib/ValueConversions_h.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/lib/Values_cpp.template renamed to ‎deps/inspector_protocol/lib/Values_cpp.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/lib/Values_h.template renamed to ‎deps/inspector_protocol/lib/Values_h.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/pdl.py renamed to ‎deps/inspector_protocol/pdl.py

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/templates/Exported_h.template renamed to ‎deps/inspector_protocol/templates/Exported_h.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/templates/Imported_h.template renamed to ‎deps/inspector_protocol/templates/Imported_h.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/templates/TypeBuilder_cpp.template renamed to ‎deps/inspector_protocol/templates/TypeBuilder_cpp.template

Copy file name to clipboard
File renamed without changes.

‎tools/inspector_protocol/templates/TypeBuilder_h.template renamed to ‎deps/inspector_protocol/templates/TypeBuilder_h.template

Copy file name to clipboard
File renamed without changes.

‎src/inspector/node_inspector.gypi

Copy file name to clipboardExpand all lines: src/inspector/node_inspector.gypi
+10-31Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
'variables': {
3-
'protocol_tool_path': '../../tools/inspector_protocol',
3+
'protocol_tool_path': '../../deps/inspector_protocol',
4+
'jinja_dir': '../../tools/inspector_protocol',
45
'node_inspector_sources': [
56
'src/inspector_agent.cc',
67
'src/inspector_io.cc',
@@ -31,30 +32,6 @@
3132
'src/inspector/network_agent.h',
3233
'src/inspector/worker_inspector.cc',
3334
'src/inspector/worker_inspector.h',
34-
35-
'<(protocol_tool_path)/crdtp/cbor.cc',
36-
'<(protocol_tool_path)/crdtp/cbor.h',
37-
'<(protocol_tool_path)/crdtp/dispatch.cc',
38-
'<(protocol_tool_path)/crdtp/dispatch.h',
39-
'<(protocol_tool_path)/crdtp/error_support.cc',
40-
'<(protocol_tool_path)/crdtp/error_support.h',
41-
'<(protocol_tool_path)/crdtp/export.h',
42-
'<(protocol_tool_path)/crdtp/find_by_first.h',
43-
'<(protocol_tool_path)/crdtp/frontend_channel.h',
44-
'<(protocol_tool_path)/crdtp/json.cc',
45-
'<(protocol_tool_path)/crdtp/json.h',
46-
'<(protocol_tool_path)/crdtp/json_platform.cc',
47-
'<(protocol_tool_path)/crdtp/json_platform.h',
48-
'<(protocol_tool_path)/crdtp/maybe.h',
49-
'<(protocol_tool_path)/crdtp/parser_handler.h',
50-
'<(protocol_tool_path)/crdtp/protocol_core.cc',
51-
'<(protocol_tool_path)/crdtp/protocol_core.h',
52-
'<(protocol_tool_path)/crdtp/serializable.cc',
53-
'<(protocol_tool_path)/crdtp/serializable.h',
54-
'<(protocol_tool_path)/crdtp/span.cc',
55-
'<(protocol_tool_path)/crdtp/span.h',
56-
'<(protocol_tool_path)/crdtp/status.cc',
57-
'<(protocol_tool_path)/crdtp/status.h',
5835
],
5936
'node_inspector_generated_sources': [
6037
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h',
@@ -91,11 +68,13 @@
9168
'<@(node_inspector_sources)',
9269
],
9370
'include_dirs': [
94-
'<(protocol_tool_path)',
9571
'<(SHARED_INTERMEDIATE_DIR)/include', # for inspector
9672
'<(SHARED_INTERMEDIATE_DIR)',
9773
'<(SHARED_INTERMEDIATE_DIR)/src', # for inspector
9874
],
75+
'dependencies': [
76+
'<(protocol_tool_path)/inspector_protocol.gyp:crdtp',
77+
],
9978
'actions': [
10079
{
10180
'action_name': 'convert_node_protocol_to_json',
@@ -107,7 +86,7 @@
10786
],
10887
'action': [
10988
'<(python)',
110-
'tools/inspector_protocol/convert_protocol_to_json.py',
89+
'<(protocol_tool_path)/convert_protocol_to_json.py',
11190
'<@(_inputs)',
11291
'<@(_outputs)',
11392
],
@@ -126,9 +105,9 @@
126105
'process_outputs_as_sources': 1,
127106
'action': [
128107
'<(python)',
129-
'tools/inspector_protocol/code_generator.py',
130-
'--inspector_protocol_dir', 'tools/inspector_protocol/',
131-
'--jinja_dir', '<@(protocol_tool_path)',
108+
'<(protocol_tool_path)/code_generator.py',
109+
'--inspector_protocol_dir', '<(protocol_tool_path)',
110+
'--jinja_dir', '<(jinja_dir)',
132111
'--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
133112
'--config', 'src/inspector/node_protocol_config.json',
134113
],
@@ -145,7 +124,7 @@
145124
],
146125
'action': [
147126
'<(python)',
148-
'tools/inspector_protocol/concatenate_protocols.py',
127+
'<(protocol_tool_path)/concatenate_protocols.py',
149128
'<@(_inputs)',
150129
'<@(_outputs)',
151130
],

‎tools/inspector_protocol/.clang-format

Copy file name to clipboardExpand all lines: tools/inspector_protocol/.clang-format
-36Lines changed: 0 additions & 36 deletions
This file was deleted.

‎tools/inspector_protocol/OWNERS

Copy file name to clipboardExpand all lines: tools/inspector_protocol/OWNERS
-8Lines changed: 0 additions & 8 deletions
This file was deleted.

‎tools/inspector_protocol/README.md

Copy file name to clipboard
+3-15Lines changed: 3 additions & 15 deletions

‎tools/inspector_protocol/codereview.settings

Copy file name to clipboardExpand all lines: tools/inspector_protocol/codereview.settings
-6Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.