@@ -54,71 +54,11 @@ index a2123cc6c6d21c53fafc8934203b3720393e7b11..245a43920c7baf000ba63192a84a4c3f
54
54
}
55
55
56
56
assert(!node_enable_inspector || node_use_openssl,
57
- diff --git a/src/inspector/unofficial.gni b/src/inspector/unofficial.gni
58
- index 5d87f3c901ab509e534598ed1eb0796a96355b5e..3d7aa148678b2646b88fa7c32abec91791b02b82 100644
59
- --- a/src/inspector/unofficial.gni
60
- +++ b/src/inspector/unofficial.gni
61
- @@ -13,7 +13,7 @@ template("inspector_gn_build") {
62
- }
63
-
64
- node_gen_dir = get_label_info("../..", "target_gen_dir")
65
- - protocol_tool_path = "../../tools/inspector_protocol"
66
- + protocol_tool_path = "../../deps/inspector_protocol"
67
-
68
- gypi_values = exec_script(
69
- "../../tools/gypi_to_gn.py",
70
- @@ -35,6 +35,8 @@ template("inspector_gn_build") {
71
- ]
72
-
73
- args = [
74
- + "--inspector_protocol_dir",
75
- + rebase_path(protocol_tool_path, root_build_dir),
76
- "--jinja_dir",
77
- # jinja is in third_party.
78
- rebase_path("//third_party/", root_build_dir),
79
- @@ -72,4 +74,37 @@ template("inspector_gn_build") {
80
- outputs = [ "$node_gen_dir/src/{{source_name_part}}.json" ]
81
- args = [ "{{source}}" ] + rebase_path(outputs, root_build_dir)
82
- }
83
- +
84
- + config("crdtp_config") {
85
- + include_dirs = [ protocol_tool_path ]
86
- + }
87
- +
88
- + static_library("crdtp") {
89
- + public_configs = [ ":crdtp_config" ]
90
- + sources = [
91
- + "$protocol_tool_path/crdtp/cbor.cc",
92
- + "$protocol_tool_path/crdtp/cbor.h",
93
- + "$protocol_tool_path/crdtp/dispatch.cc",
94
- + "$protocol_tool_path/crdtp/dispatch.h",
95
- + "$protocol_tool_path/crdtp/error_support.cc",
96
- + "$protocol_tool_path/crdtp/error_support.h",
97
- + "$protocol_tool_path/crdtp/export.h",
98
- + "$protocol_tool_path/crdtp/find_by_first.h",
99
- + "$protocol_tool_path/crdtp/frontend_channel.h",
100
- + "$protocol_tool_path/crdtp/glue.h",
101
- + "$protocol_tool_path/crdtp/json.cc",
102
- + "$protocol_tool_path/crdtp/json.h",
103
- + "$protocol_tool_path/crdtp/parser_handler.h",
104
- + "$protocol_tool_path/crdtp/protocol_core.cc",
105
- + "$protocol_tool_path/crdtp/protocol_core.h",
106
- + "$protocol_tool_path/crdtp/serializable.cc",
107
- + "$protocol_tool_path/crdtp/serializable.h",
108
- + "$protocol_tool_path/crdtp/span.cc",
109
- + "$protocol_tool_path/crdtp/span.h",
110
- + "$protocol_tool_path/crdtp/status.cc",
111
- + "$protocol_tool_path/crdtp/status.h",
112
- + "$protocol_tool_path/crdtp/json_platform.cc",
113
- + "$protocol_tool_path/crdtp/json_platform.h",
114
- + ]
115
- + }
116
- }
117
57
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
118
- index 894fd515202cc3a1f933c2bbc618dd09869ad904..4f1ed661e9c432f3b50f2e7e348ad9794ff773d0 100644
58
+ index e85860de93dd5753dd4542ecee9f0888af93898a..04eab49c368c8f86837ed2c1384bf3c63e4bde24 100644
119
59
--- a/src/node_builtins.cc
120
60
+++ b/src/node_builtins.cc
121
- @@ -781 ,6 +781 ,7 @@ void BuiltinLoader::RegisterExternalReferences(
61
+ @@ -783 ,6 +783 ,7 @@ void BuiltinLoader::RegisterExternalReferences(
122
62
registry->Register(GetNatives);
123
63
124
64
RegisterExternalReferencesForInternalizedBuiltinCode(registry);
@@ -306,38 +246,53 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2
306
246
} // namespace js2c
307
247
} // namespace node
308
248
diff --git a/tools/search_files.py b/tools/search_files.py
309
- index 65d0e1be42f0a85418491ebb548278cf431aa6a0..d4a31342f1c6107b029394c6e1d00a1d1e877e03 100755
249
+ index 856878c33681a73d41016729dabe48b0a6a80589..91a11852d206b65485fe90fd037a0bd17a16c20b 100755
310
250
--- a/tools/search_files.py
311
251
+++ b/tools/search_files.py
312
252
@@ -14,6 +14,7 @@ if __name__ == '__main__':
313
253
try:
314
254
files = SearchFiles(*sys.argv[2:])
315
255
files = [ os.path.relpath(x, sys.argv[1]) for x in files ]
316
256
+ files = [os.path.normpath(x).replace(os.sep, '/') for x in files]
317
- print('\n'.join(files))
318
- except Exception as e :
319
- print(str(e))
257
+ # Apply the same transform in SearchFiles after relpath
258
+ if sys.platform == 'win32' :
259
+ files = [ x.replace('\\', '/') for x in files ]
320
260
diff --git a/unofficial.gni b/unofficial.gni
321
- index 9e496d99d7141bf42ef7374a3c676c7b333eeeab..a2f3a769ceaa08db6d7438223884dc5aeab1340d 100644
261
+ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50ae50a3d8 100644
322
262
--- a/unofficial.gni
323
263
+++ b/unofficial.gni
324
- @@ -145,6 +145,7 @@ template("node_gn_build") {
264
+ @@ -142,32 +142,39 @@ template("node_gn_build") {
265
+ public_configs = [
266
+ ":node_external_config",
267
+ "deps/googletest:googletest_config",
268
+ + ":zstd_include_config"
269
+ ]
325
270
public_deps = [
326
271
"deps/ada",
327
272
"deps/uv",
328
273
+ "//electron:electron_js2c",
329
274
"deps/simdjson",
330
275
"$node_v8_path",
331
276
]
332
- @@ -156,7 +157,6 @@ template("node_gn_build") {
277
+ deps = [
278
+ ":run_node_js2c",
279
+ - "deps/brotli",
280
+ "deps/cares",
281
+ "deps/histogram",
333
282
"deps/llhttp",
334
283
"deps/nbytes",
335
284
"deps/nghttp2",
336
285
- "deps/ngtcp2",
337
286
"deps/postject",
338
287
"deps/sqlite",
339
288
"deps/uvwasi",
340
- @@ -165,7 +165,11 @@ template("node_gn_build") {
289
+ - "deps/zstd",
290
+ "//third_party/zlib",
291
+ + "//third_party/brotli:dec",
292
+ + "//third_party/brotli:enc",
293
+ + "//third_party/zstd:decompress",
294
+ + "//third_party/zstd:headers",
295
+ "$node_simdutf_path",
341
296
"$node_v8_path:v8_libplatform",
342
297
]
343
298
@@ -349,7 +304,7 @@ index 9e496d99d7141bf42ef7374a3c676c7b333eeeab..a2f3a769ceaa08db6d7438223884dc5a
349
304
"$target_gen_dir/node_javascript.cc",
350
305
] + gypi_values.node_sources
351
306
352
- @@ -185,11 +189,12 @@ template("node_gn_build") {
307
+ @@ -190,7 +197,7 @@ template("node_gn_build") {
353
308
}
354
309
if (node_use_openssl) {
355
310
deps += [ "deps/ncrypto" ]
@@ -358,20 +313,26 @@ index 9e496d99d7141bf42ef7374a3c676c7b333eeeab..a2f3a769ceaa08db6d7438223884dc5a
358
313
sources += gypi_values.node_crypto_sources
359
314
}
360
315
if (node_enable_inspector) {
361
- deps += [
362
- + "src/inspector:crdtp",
363
- "src/inspector:node_protocol_generated_sources",
364
- "src/inspector:v8_inspector_compress_protocol_json",
365
- ]
366
- @@ -282,6 +287,7 @@ template("node_gn_build") {
316
+ @@ -214,6 +221,10 @@ template("node_gn_build") {
317
+ }
318
+ }
319
+
320
+ + config("zstd_include_config") {
321
+ + include_dirs = [ "//third_party/zstd/src/lib" ]
322
+ + }
323
+ +
324
+ executable(target_name) {
325
+ forward_variables_from(invoker, "*")
326
+
327
+ @@ -288,6 +299,7 @@ template("node_gn_build") {
367
328
}
368
329
369
330
executable("node_js2c") {
370
331
+ defines = []
371
332
deps = [
372
333
"deps/uv",
373
334
"$node_simdutf_path",
374
- @@ -292 ,26 +298 ,75 @@ template("node_gn_build") {
335
+ @@ -298 ,26 +310 ,75 @@ template("node_gn_build") {
375
336
"src/embedded_data.cc",
376
337
"src/embedded_data.h",
377
338
]
@@ -457,7 +418,7 @@ index 9e496d99d7141bf42ef7374a3c676c7b333eeeab..a2f3a769ceaa08db6d7438223884dc5a
457
418
outputs = [ "$target_gen_dir/node_javascript.cc" ]
458
419
459
420
# Get the path to node_js2c executable of the host toolchain.
460
- @@ -325 ,11 +380 ,11 @@ template("node_gn_build") {
421
+ @@ -331 ,11 +392 ,11 @@ template("node_gn_build") {
461
422
get_label_info(":node_js2c($host_toolchain)", "name") +
462
423
host_executable_suffix
463
424
0 commit comments