Skip to content

Commit aae0ece

Browse files
refacktargos
refack
authored and
targos
committed
build: encapsulate node/inspector gyp scafolding
PR-URL: #23156 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Joyee Cheung <[email protected]>
1 parent 7391738 commit aae0ece

File tree

2 files changed

+150
-194
lines changed

2 files changed

+150
-194
lines changed

‎node.gyp

+1-194
Original file line numberDiff line numberDiff line change
@@ -500,40 +500,7 @@
500500
'product_name': 'node_base',
501501
}],
502502
[ 'v8_enable_inspector==1', {
503-
'defines': [
504-
'HAVE_INSPECTOR=1',
505-
],
506-
'sources': [
507-
'src/inspector_agent.cc',
508-
'src/inspector_io.cc',
509-
'src/inspector_js_api.cc',
510-
'src/inspector_socket.cc',
511-
'src/inspector_socket_server.cc',
512-
'src/inspector/main_thread_interface.cc',
513-
'src/inspector/worker_inspector.cc',
514-
'src/inspector/node_string.cc',
515-
'src/inspector/worker_agent.cc',
516-
'src/inspector/tracing_agent.cc',
517-
'src/inspector_agent.h',
518-
'src/inspector_io.h',
519-
'src/inspector_socket.h',
520-
'src/inspector_socket_server.h',
521-
'src/inspector/main_thread_interface.h',
522-
'src/inspector/worker_inspector.h',
523-
'src/inspector/node_string.h',
524-
'src/inspector/worker_agent.h',
525-
'src/inspector/tracing_agent.h',
526-
'<@(node_inspector_generated_sources)'
527-
],
528-
'dependencies': [
529-
'node_protocol_generated_sources#host',
530-
'v8_inspector_compress_protocol_json#host',
531-
],
532-
'include_dirs': [
533-
'<(SHARED_INTERMEDIATE_DIR)/include', # for inspector
534-
'<(SHARED_INTERMEDIATE_DIR)',
535-
'<(SHARED_INTERMEDIATE_DIR)/src', # for inspector
536-
],
503+
'includes' : [ 'src/inspector/node_inspector.gypi' ],
537504
}, {
538505
'defines': [ 'HAVE_INSPECTOR=0' ]
539506
}],
@@ -1063,165 +1030,5 @@
10631030
},
10641031
]
10651032
}], # end aix section
1066-
[ 'v8_enable_inspector==1', {
1067-
'variables': {
1068-
'protocol_path': 'tools/inspector_protocol',
1069-
'node_inspector_path': 'src/inspector',
1070-
'node_inspector_generated_sources': [
1071-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h',
1072-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Protocol.cpp',
1073-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Protocol.h',
1074-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeWorker.cpp',
1075-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeWorker.h',
1076-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeTracing.cpp',
1077-
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/NodeTracing.h',
1078-
],
1079-
'node_protocol_files': [
1080-
'<(protocol_path)/lib/Allocator_h.template',
1081-
'<(protocol_path)/lib/Array_h.template',
1082-
'<(protocol_path)/lib/Collections_h.template',
1083-
'<(protocol_path)/lib/DispatcherBase_cpp.template',
1084-
'<(protocol_path)/lib/DispatcherBase_h.template',
1085-
'<(protocol_path)/lib/ErrorSupport_cpp.template',
1086-
'<(protocol_path)/lib/ErrorSupport_h.template',
1087-
'<(protocol_path)/lib/Forward_h.template',
1088-
'<(protocol_path)/lib/FrontendChannel_h.template',
1089-
'<(protocol_path)/lib/Maybe_h.template',
1090-
'<(protocol_path)/lib/Object_cpp.template',
1091-
'<(protocol_path)/lib/Object_h.template',
1092-
'<(protocol_path)/lib/Parser_cpp.template',
1093-
'<(protocol_path)/lib/Parser_h.template',
1094-
'<(protocol_path)/lib/Protocol_cpp.template',
1095-
'<(protocol_path)/lib/ValueConversions_h.template',
1096-
'<(protocol_path)/lib/Values_cpp.template',
1097-
'<(protocol_path)/lib/Values_h.template',
1098-
'<(protocol_path)/templates/Exported_h.template',
1099-
'<(protocol_path)/templates/Imported_h.template',
1100-
'<(protocol_path)/templates/TypeBuilder_cpp.template',
1101-
'<(protocol_path)/templates/TypeBuilder_h.template',
1102-
'<(protocol_path)/CodeGenerator.py',
1103-
]
1104-
},
1105-
'targets': [
1106-
{
1107-
'target_name': 'prepare_protocol_json',
1108-
'type': 'none',
1109-
'toolsets': ['host'],
1110-
'copies': [
1111-
{
1112-
'files': [
1113-
'<(node_inspector_path)/node_protocol_config.json',
1114-
'<(node_inspector_path)/node_protocol.pdl'
1115-
],
1116-
'destination': '<(SHARED_INTERMEDIATE_DIR)',
1117-
}
1118-
],
1119-
'actions': [
1120-
{
1121-
'action_name': 'convert_node_protocol_to_json',
1122-
'inputs': [
1123-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.pdl',
1124-
],
1125-
'outputs': [
1126-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.json',
1127-
],
1128-
'action': [
1129-
'python',
1130-
'tools/inspector_protocol/ConvertProtocolToJSON.py',
1131-
'<@(_inputs)',
1132-
'<@(_outputs)',
1133-
],
1134-
},
1135-
]
1136-
},
1137-
{
1138-
'target_name': 'node_protocol_generated_sources',
1139-
'type': 'none',
1140-
'toolsets': ['host'],
1141-
'dependencies': ['prepare_protocol_json'],
1142-
'actions': [
1143-
{
1144-
'action_name': 'node_protocol_generated_sources',
1145-
'inputs': [
1146-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json',
1147-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.json',
1148-
'<@(node_protocol_files)',
1149-
],
1150-
'outputs': [
1151-
'<@(node_inspector_generated_sources)',
1152-
],
1153-
'action': [
1154-
'python',
1155-
'<(protocol_path)/CodeGenerator.py',
1156-
'--jinja_dir', '<@(protocol_path)/..',
1157-
'--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
1158-
'--config', '<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json',
1159-
],
1160-
'message': 'Generating node protocol sources from protocol json',
1161-
},
1162-
]
1163-
},
1164-
{
1165-
'target_name': 'v8_inspector_compress_protocol_json',
1166-
'type': 'none',
1167-
'toolsets': ['host'],
1168-
'copies': [
1169-
{
1170-
'destination': '<(SHARED_INTERMEDIATE_DIR)',
1171-
'files': ['deps/v8/src/inspector/js_protocol.pdl']
1172-
}
1173-
],
1174-
'actions': [
1175-
{
1176-
'action_name': 'v8_inspector_convert_protocol_to_json',
1177-
'inputs': [
1178-
'<(SHARED_INTERMEDIATE_DIR)/js_protocol.pdl',
1179-
],
1180-
'outputs': [
1181-
'<(SHARED_INTERMEDIATE_DIR)/js_protocol.json',
1182-
],
1183-
'action': [
1184-
'python',
1185-
'tools/inspector_protocol/ConvertProtocolToJSON.py',
1186-
'<@(_inputs)',
1187-
'<@(_outputs)',
1188-
],
1189-
},
1190-
{
1191-
'action_name': 'concatenate_protocols',
1192-
'inputs': [
1193-
'<(SHARED_INTERMEDIATE_DIR)/js_protocol.json',
1194-
'<(SHARED_INTERMEDIATE_DIR)/node_protocol.json',
1195-
],
1196-
'outputs': [
1197-
'<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json',
1198-
],
1199-
'action': [
1200-
'python',
1201-
'tools/inspector_protocol/ConcatenateProtocols.py',
1202-
'<@(_inputs)',
1203-
'<@(_outputs)',
1204-
],
1205-
},
1206-
{
1207-
'action_name': 'v8_inspector_compress_protocol_json',
1208-
'process_outputs_as_sources': 1,
1209-
'inputs': [
1210-
'<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json',
1211-
],
1212-
'outputs': [
1213-
'<(SHARED_INTERMEDIATE_DIR)/v8_inspector_protocol_json.h',
1214-
],
1215-
'action': [
1216-
'python',
1217-
'tools/compress_json.py',
1218-
'<@(_inputs)',
1219-
'<@(_outputs)',
1220-
],
1221-
},
1222-
],
1223-
},
1224-
]
1225-
}]
12261033
], # end conditions block
12271034
}

‎src/inspector/node_inspector.gypi

+149
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)