Skip to content

Commit 1e9c1aa

Browse files
committed
update BUILD.gn for new files
introduced in nodejs/node#29349
1 parent 1b2fa04 commit 1e9c1aa

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

patches/node/.patches

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ src_disable_node_use_v8_platform_in_node_options.patch
2626
build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
2727
refactor_allow_embedder_overriding_of_internal_fs_calls.patch
2828
chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch
29+
chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
30+
inherit_electron_crashpad_pipe_name_in_child_process.patch
2931
fixme_revert_crypto_add_support_for_rsa-pss_keys.patch
3032
chore_re-add_compileandcall_this_should_be_added_as_a_helper_in.patch
3133
fix_extern_the_nativemoduleenv_and_options_parser_for_debug_builds.patch

patches/node/build_add_gn_build_files.patch

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -882,10 +882,10 @@ index 0000000000000000000000000000000000000000..f13b471d17128468bed06e66bd03a2ea
882882
+}
883883
diff --git a/filenames.json b/filenames.json
884884
new file mode 100644
885-
index 0000000000000000000000000000000000000000..be8613d11f9f5b1c6604257edf707792f2119fcb
885+
index 0000000000000000000000000000000000000000..bfe6555be5239c6d9cad59e8b845638d50f31ee3
886886
--- /dev/null
887887
+++ b/filenames.json
888-
@@ -0,0 +1,442 @@
888+
@@ -0,0 +1,447 @@
889889
+// This file is automatically generated by generate_gn_filenames_json.py
890890
+// DO NOT EDIT
891891
+{
@@ -1051,6 +1051,7 @@ index 0000000000000000000000000000000000000000..be8613d11f9f5b1c6604257edf707792
10511051
+ "lib/internal/fixed_queue.js",
10521052
+ "lib/internal/freelist.js",
10531053
+ "lib/internal/freeze_intrinsics.js",
1054+
+ "lib/internal/fs/dir.js",
10541055
+ "lib/internal/fs/promises.js",
10551056
+ "lib/internal/fs/read_file_context.js",
10561057
+ "lib/internal/fs/rimraf.js",
@@ -1105,6 +1106,8 @@ index 0000000000000000000000000000000000000000..be8613d11f9f5b1c6604257edf707792
11051106
+ "lib/internal/repl/history.js",
11061107
+ "lib/internal/repl/utils.js",
11071108
+ "lib/internal/socket_list.js",
1109+
+ "lib/internal/source_map/source_map.js",
1110+
+ "lib/internal/source_map/source_map_cache.js",
11081111
+ "lib/internal/test/binding.js",
11091112
+ "lib/internal/timers.js",
11101113
+ "lib/internal/tls.js",
@@ -1190,6 +1193,7 @@ index 0000000000000000000000000000000000000000..be8613d11f9f5b1c6604257edf707792
11901193
+ "src/node_constants.cc",
11911194
+ "src/node_contextify.cc",
11921195
+ "src/node_credentials.cc",
1196+
+ "src/node_dir.cc",
11931197
+ "src/node_domain.cc",
11941198
+ "src/node_env_var.cc",
11951199
+ "src/node_errors.cc",
@@ -1271,6 +1275,7 @@ index 0000000000000000000000000000000000000000..be8613d11f9f5b1c6604257edf707792
12711275
+ "src/node_constants.h",
12721276
+ "src/node_context_data.h",
12731277
+ "src/node_contextify.h",
1278+
+ "src/node_dir.h",
12741279
+ "src/node_errors.h",
12751280
+ "src/node_file.h",
12761281
+ "src/node_http_parser_impl.h",
@@ -1534,7 +1539,7 @@ index 0000000000000000000000000000000000000000..f3c5c798c0aefcb8cf9b1570a7b4817c
15341539
+ args = rebase_path(inputs + outputs, root_build_dir)
15351540
+}
15361541
diff --git a/src/node_version.h b/src/node_version.h
1537-
index 2d105483ba10533d992de3265121e6ab9edce2ed..8a8fd5f7fad4a69b65e06d67225a398385d3bbbf 100644
1542+
index a61a186edd3c92d6f0bd760a9990b5c8ed57e6fa..e4963fdfd9b93a6f50a4f1035f63e95432dd8d8e 100644
15381543
--- a/src/node_version.h
15391544
+++ b/src/node_version.h
15401545
@@ -89,7 +89,10 @@
@@ -1666,25 +1671,25 @@ index 0000000000000000000000000000000000000000..3088ae4bdf814ae255c9805ebd393b2e
16661671
+
16671672
+ out_file.writelines(new_contents)
16681673
diff --git a/tools/js2c.py b/tools/js2c.py
1669-
index 0189dd762919162c8a897d291bdda3cfd600eab6..7b3e90af88b873c32f8ed51712f7dfdff3c1c706 100755
1674+
index 1346b2a87046d3472577875c887b3b44a63280ed..752344d68c3f63b4c5e491b33d4576ed48f8b74f 100755
16701675
--- a/tools/js2c.py
16711676
+++ b/tools/js2c.py
1672-
@@ -261,9 +261,17 @@ def NormalizeFileName(filename):
1677+
@@ -261,10 +261,18 @@ def NormalizeFileName(filename):
16731678
split = ['internal'] + split
16741679
else: # `lib/**/*.js` so drop the 'lib' part
16751680
split = split[1:]
16761681
+
16771682
if len(split):
16781683
filename = '/'.join(split)
16791684
- return os.path.splitext(filename)[0]
1680-
+
1685+
16811686
+ # Electron-specific: when driving the node build from Electron, we generate
16821687
+ # config.gypi in a separate directory and pass the absolute path to js2c.
16831688
+ # This overrides the absolute path so that the variable names in the
16841689
+ # generated C are as if it was in the root node directory.
16851690
+ if filename.endswith("/config.gypi"):
16861691
+ filename = "config.gypi"
1687-
1692+
+
16881693
+ return os.path.splitext(filename)[0]
16891694

16901695
def JS2C(source_files, target):

0 commit comments

Comments
 (0)