Skip to content

Commit 375e16e

Browse files
refackrefack
committed
build: encapsulate node/inspector gyp scafolding
PR-URL: #23156 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Joyee Cheung <[email protected]>
1 parent 6dd4a07 commit 375e16e

File tree

2 files changed

+150
-194
lines changed

2 files changed

+150
-194
lines changed

‎node.gyp‎

Lines changed: 1 addition & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -491,40 +491,7 @@
491491
'product_name': 'node_base',
492492
}],
493493
[ 'v8_enable_inspector==1', {
494-
'defines': [
495-
'HAVE_INSPECTOR=1',
496-
],
497-
'sources': [
498-
'src/inspector_agent.cc',
499-
'src/inspector_io.cc',
500-
'src/inspector_js_api.cc',
501-
'src/inspector_socket.cc',
502-
'src/inspector_socket_server.cc',
503-
'src/inspector/main_thread_interface.cc',
504-
'src/inspector/worker_inspector.cc',
505-
'src/inspector/node_string.cc',
506-
'src/inspector/worker_agent.cc',
507-
'src/inspector/tracing_agent.cc',
508-
'src/inspector_agent.h',
509-
'src/inspector_io.h',
510-
'src/inspector_socket.h',
511-
'src/inspector_socket_server.h',
512-
'src/inspector/main_thread_interface.h',
513-
'src/inspector/worker_inspector.h',
514-
'src/inspector/node_string.h',
515-
'src/inspector/worker_agent.h',
516-
'src/inspector/tracing_agent.h',
517-
'<@(node_inspector_generated_sources)'
518-
],
519-
'dependencies': [
520-
'node_protocol_generated_sources#host',
521-
'v8_inspector_compress_protocol_json#host',
522-
],
523-
'include_dirs': [
524-
'<(SHARED_INTERMEDIATE_DIR)/include', # for inspector
525-
'<(SHARED_INTERMEDIATE_DIR)',
526-
'<(SHARED_INTERMEDIATE_DIR)/src', # for inspector
527-
],
494+
'includes' : [ 'src/inspector/node_inspector.gypi' ],
528495
}, {
529496
'defines': [ 'HAVE_INSPECTOR=0' ]
530497
}],
@@ -989,165 +956,5 @@
989956
},
990957
]
991958
}], # end aix section
992-
[ 'v8_enable_inspector==1', {
993-
'variables': {
994-
'protocol_path': 'tools/inspector_protocol',
995-
'node_inspector_path': 'src/inspector',
996-
'node_inspector_generated_sources': [
997-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h',
998-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Protocol.cpp',
999-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Protocol.h',
1000-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeWorker.cpp',
1001-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeWorker.h',
1002-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeTracing.cpp',
1003-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeTracing.h',
1004-
],
1005-
'node_protocol_files': [
1006-
'<(protocol_path)/lib/Allocator_h.template',
1007-
'<(protocol_path)/lib/Array_h.template',
1008-
'<(protocol_path)/lib/Collections_h.template',
1009-
'<(protocol_path)/lib/DispatcherBase_cpp.template',
1010-
'<(protocol_path)/lib/DispatcherBase_h.template',
1011-
'<(protocol_path)/lib/ErrorSupport_cpp.template',
1012-
'<(protocol_path)/lib/ErrorSupport_h.template',
1013-
'<(protocol_path)/lib/Forward_h.template',
1014-
'<(protocol_path)/lib/FrontendChannel_h.template',
1015-
'<(protocol_path)/lib/Maybe_h.template',
1016-
'<(protocol_path)/lib/Object_cpp.template',
1017-
'<(protocol_path)/lib/Object_h.template',
1018-
'<(protocol_path)/lib/Parser_cpp.template',
1019-
'<(protocol_path)/lib/Parser_h.template',
1020-
'<(protocol_path)/lib/Protocol_cpp.template',
1021-
'<(protocol_path)/lib/ValueConversions_h.template',
1022-
'<(protocol_path)/lib/Values_cpp.template',
1023-
'<(protocol_path)/lib/Values_h.template',
1024-
'<(protocol_path)/templates/Exported_h.template',
1025-
'<(protocol_path)/templates/Imported_h.template',
1026-
'<(protocol_path)/templates/TypeBuilder_cpp.template',
1027-
'<(protocol_path)/templates/TypeBuilder_h.template',
1028-
'<(protocol_path)/CodeGenerator.py',
1029-
]
1030-
},
1031-
'targets': [
1032-
{
1033-
'target_name': 'prepare_protocol_json',
1034-
'type': 'none',
1035-
'toolsets': ['host'],
1036-
'copies': [
1037-
{
1038-
'files': [
1039-
'<(node_inspector_path)/node_protocol_config.json',
1040-
'<(node_inspector_path)/node_protocol.pdl'
1041-
],
1042-
'destination': '<(SHARED_INTERMEDIATE_DIR)',
1043-
}
1044-
],
1045-
'actions': [
1046-
{
1047-
'action_name': 'convert_node_protocol_to_json',
1048-
'inputs': [
1049-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.pdl',
1050-
],
1051-
'outputs': [
1052-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.json',
1053-
],
1054-
'action': [
1055-
'python',
1056-
'tools/inspector_protocol/ConvertProtocolToJSON.py',
1057-
'<@(_inputs)',
1058-
'<@(_outputs)',
1059-
],
1060-
},
1061-
]
1062-
},
1063-
{
1064-
'target_name': 'node_protocol_generated_sources',
1065-
'type': 'none',
1066-
'toolsets': ['host'],
1067-
'dependencies': ['prepare_protocol_json'],
1068-
'actions': [
1069-
{
1070-
'action_name': 'node_protocol_generated_sources',
1071-
'inputs': [
1072-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json',
1073-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.json',
1074-
'<@(node_protocol_files)',
1075-
],
1076-
'outputs': [
1077-
'<@(node_inspector_generated_sources)',
1078-
],
1079-
'action': [
1080-
'python',
1081-
'<(protocol_path)/CodeGenerator.py',
1082-
'--jinja_dir', '<@(protocol_path)/..',
1083-
'--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
1084-
'--config', '<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json',
1085-
],
1086-
'message': 'Generating node protocol sources from protocol json',
1087-
},
1088-
]
1089-
},
1090-
{
1091-
'target_name': 'v8_inspector_compress_protocol_json',
1092-
'type': 'none',
1093-
'toolsets': ['host'],
1094-
'copies': [
1095-
{
1096-
'destination': '<(SHARED_INTERMEDIATE_DIR)',
1097-
'files': ['deps/v8/src/inspector/js_protocol.pdl']
1098-
}
1099-
],
1100-
'actions': [
1101-
{
1102-
'action_name': 'v8_inspector_convert_protocol_to_json',
1103-
'inputs': [
1104-
'<(SHARED_INTERMEDIATE_DIR)/js_protocol.pdl',
1105-
],
1106-
'outputs': [
1107-
'<(SHARED_INTERMEDIATE_DIR)/js_protocol.json',
1108-
],
1109-
'action': [
1110-
'python',
1111-
'tools/inspector_protocol/ConvertProtocolToJSON.py',
1112-
'<@(_inputs)',
1113-
'<@(_outputs)',
1114-
],
1115-
},
1116-
{
1117-
'action_name': 'concatenate_protocols',
1118-
'inputs': [
1119-
'<(SHARED_INTERMEDIATE_DIR)/js_protocol.json',
1120-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.json',
1121-
],
1122-
'outputs': [
1123-
'<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json',
1124-
],
1125-
'action': [
1126-
'python',
1127-
'tools/inspector_protocol/ConcatenateProtocols.py',
1128-
'<@(_inputs)',
1129-
'<@(_outputs)',
1130-
],
1131-
},
1132-
{
1133-
'action_name': 'v8_inspector_compress_protocol_json',
1134-
'process_outputs_as_sources': 1,
1135-
'inputs': [
1136-
'<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json',
1137-
],
1138-
'outputs': [
1139-
'<(SHARED_INTERMEDIATE_DIR)/v8_inspector_protocol_json.h',
1140-
],
1141-
'action': [
1142-
'python',
1143-
'tools/compress_json.py',
1144-
'<@(_inputs)',
1145-
'<@(_outputs)',
1146-
],
1147-
},
1148-
],
1149-
},
1150-
]
1151-
}]
1152959
], # end conditions block
1153960
}

‎src/inspector/node_inspector.gypi‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
{
2+
'variables': {
3+
'protocol_tool_path': '../../tools/inspector_protocol',
4+
'node_inspector_path': '../../src/inspector',
5+
'node_inspector_generated_sources': [
6+
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h',
7+
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Protocol.cpp',
8+
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Protocol.h',
9+
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeWorker.cpp',
10+
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeWorker.h',
11+
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeTracing.cpp',
12+
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeTracing.h',
13+
],
14+
'node_protocol_files': [
15+
'<(protocol_tool_path)/lib/Allocator_h.template',
16+
'<(protocol_tool_path)/lib/Array_h.template',
17+
'<(protocol_tool_path)/lib/Collections_h.template',
18+
'<(protocol_tool_path)/lib/DispatcherBase_cpp.template',
19+
'<(protocol_tool_path)/lib/DispatcherBase_h.template',
20+
'<(protocol_tool_path)/lib/ErrorSupport_cpp.template',
21+
'<(protocol_tool_path)/lib/ErrorSupport_h.template',
22+
'<(protocol_tool_path)/lib/Forward_h.template',
23+
'<(protocol_tool_path)/lib/FrontendChannel_h.template',
24+
'<(protocol_tool_path)/lib/Maybe_h.template',
25+
'<(protocol_tool_path)/lib/Object_cpp.template',
26+
'<(protocol_tool_path)/lib/Object_h.template',
27+
'<(protocol_tool_path)/lib/Parser_cpp.template',
28+
'<(protocol_tool_path)/lib/Parser_h.template',
29+
'<(protocol_tool_path)/lib/Protocol_cpp.template',
30+
'<(protocol_tool_path)/lib/ValueConversions_h.template',
31+
'<(protocol_tool_path)/lib/Values_cpp.template',
32+
'<(protocol_tool_path)/lib/Values_h.template',
33+
'<(protocol_tool_path)/templates/Exported_h.template',
34+
'<(protocol_tool_path)/templates/Imported_h.template',
35+
'<(protocol_tool_path)/templates/TypeBuilder_cpp.template',
36+
'<(protocol_tool_path)/templates/TypeBuilder_h.template',
37+
'<(protocol_tool_path)/CodeGenerator.py',
38+
]
39+
},
40+
'defines': [
41+
'HAVE_INSPECTOR=1',
42+
],
43+
'sources': [
44+
'../../src/inspector_agent.cc',
45+
'../../src/inspector_io.cc',
46+
'../../src/inspector_agent.h',
47+
'../../src/inspector_io.h',
48+
'../../src/inspector_js_api.cc',
49+
'../../src/inspector_socket.cc',
50+
'../../src/inspector_socket.h',
51+
'../../src/inspector_socket_server.cc',
52+
'../../src/inspector_socket_server.h',
53+
'../../src/inspector/main_thread_interface.cc',
54+
'../../src/inspector/main_thread_interface.h',
55+
'../../src/inspector/node_string.cc',
56+
'../../src/inspector/node_string.h',
57+
'../../src/inspector/tracing_agent.cc',
58+
'../../src/inspector/tracing_agent.h',
59+
'../../src/inspector/worker_agent.cc',
60+
'../../src/inspector/worker_agent.h',
61+
'../../src/inspector/worker_inspector.cc',
62+
'../../src/inspector/worker_inspector.h',
63+
],
64+
'include_dirs': [
65+
'<(SHARED_INTERMEDIATE_DIR)/include', # for inspector
66+
'<(SHARED_INTERMEDIATE_DIR)',
67+
'<(SHARED_INTERMEDIATE_DIR)/src', # for inspector
68+
],
69+
'copies': [
70+
{
71+
'files': [
72+
'<(node_inspector_path)/node_protocol_config.json',
73+
'<(node_inspector_path)/node_protocol.pdl'
74+
],
75+
'destination': '<(SHARED_INTERMEDIATE_DIR)',
76+
}
77+
],
78+
'actions': [
79+
{
80+
'action_name': 'convert_node_protocol_to_json',
81+
'inputs': [
82+
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.pdl',
83+
],
84+
'outputs': [
85+
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.json',
86+
],
87+
'action': [
88+
'python',
89+
'tools/inspector_protocol/ConvertProtocolToJSON.py',
90+
'<@(_inputs)',
91+
'<@(_outputs)',
92+
],
93+
},
94+
{
95+
'action_name': 'node_protocol_generated_sources',
96+
'process_outputs_as_sources': 0,
97+
'inputs': [
98+
'<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json',
99+
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.json',
100+
'<@(node_protocol_files)',
101+
],
102+
'outputs': [
103+
'<@(node_inspector_generated_sources)',
104+
],
105+
'process_outputs_as_sources': 1,
106+
'action': [
107+
'python',
108+
'tools/inspector_protocol/CodeGenerator.py',
109+
'--jinja_dir', '<@(protocol_tool_path)/..',
110+
'--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
111+
'--config', '<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json',
112+
],
113+
'message': 'Generating node protocol sources from protocol json',
114+
},
115+
{
116+
'action_name': 'concatenate_protocols',
117+
'inputs': [
118+
'../../deps/v8/src/inspector/js_protocol.json',
119+
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.json',
120+
],
121+
'outputs': [
122+
'<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json',
123+
],
124+
'action': [
125+
'python',
126+
'tools/inspector_protocol/ConcatenateProtocols.py',
127+
'<@(_inputs)',
128+
'<@(_outputs)',
129+
],
130+
},
131+
{
132+
'action_name': 'v8_inspector_compress_protocol_json',
133+
'process_outputs_as_sources': 0,
134+
'inputs': [
135+
'<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json',
136+
],
137+
'outputs': [
138+
'<(SHARED_INTERMEDIATE_DIR)/v8_inspector_protocol_json.h',
139+
],
140+
'process_outputs_as_sources': 1,
141+
'action': [
142+
'python',
143+
'tools/compress_json.py',
144+
'<@(_inputs)',
145+
'<@(_outputs)',
146+
],
147+
},
148+
],
149+
}

0 commit comments

Comments
 (0)