mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build: fix Node.js filename generation (#25577)

Browse source
This commit is contained in:
Shelley Vohr 2020-09-23 12:48:23 -07:00 committed by GitHub
parent 9d0d9a1664
commit 353c63e47a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
patches/node/build_add_gn_build_files.patch
View file

@ -1615,10 +1615,10 @@ index 0000000000000000000000000000000000000000..01f62d4ae6e3b9d539444e3dff069f00
+ main(sys.argv[1:]) + main(sys.argv[1:])
diff --git a/tools/generate_gn_filenames_json.py b/tools/generate_gn_filenames_json.py diff --git a/tools/generate_gn_filenames_json.py b/tools/generate_gn_filenames_json.py
new file mode 100755 new file mode 100755
index 0000000000000000000000000000000000000000..9be5ffae55057c4072599d17384735984851de5a index 0000000000000000000000000000000000000000..e5fd79da5323e7039730fd8cca66caae8c84e903
--- /dev/null --- /dev/null
+++ b/tools/generate_gn_filenames_json.py +++ b/tools/generate_gn_filenames_json.py
@@ -0,0 +1,63 @@ @@ -0,0 +1,70 @@
+#!/usr/bin/env python +#!/usr/bin/env python
+import json +import json
+import os +import os
@ -1653,21 +1653,28 @@ index 0000000000000000000000000000000000000000..9be5ffae55057c4072599d1738473598
+ node_gyp_path = os.path.join(node_root_dir, 'node.gyp') + node_gyp_path = os.path.join(node_root_dir, 'node.gyp')
+ out = {} + out = {}
+ node_gyp = LoadPythonDictionary(node_gyp_path) + node_gyp = LoadPythonDictionary(node_gyp_path)
+ out['library_files'] = node_gyp['variables']['library_files']
+ node_lib_target = next( + node_lib_target = next(
+ t for t in node_gyp['targets'] + t for t in node_gyp['targets']
+ if t['target_name'] == '<(node_lib_target_name)') + if t['target_name'] == '<(node_lib_target_name)')
+ node_source_blacklist = { + node_source_blocklist = {
+ '<@(library_files)', + '<@(library_files)',
+ 'common.gypi', + 'common.gypi',
+ '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', + '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
+ } + }
+ out['node_sources'] = [ +
+ def filter_v8_files(files):
+ if any(f.startswith('deps/v8/') for f in files):
+ files = [f.replace('deps/v8/', '//v8/', 1) for f in files]
+ return files
+
+ out['library_files'] = filter_v8_files(node_gyp['variables']['library_files'])
+
+ blocklisted_sources = [
+ f for f in node_lib_target['sources'] + f for f in node_lib_target['sources']
+ if f not in node_source_blacklist] + if f not in node_source_blocklist]
+ out['node_sources'] = filter_v8_files(blocklisted_sources)
+ +
+ out['headers'] = [] + out['headers'] = []
+
+ def add_headers(files, dest_dir): + def add_headers(files, dest_dir):
+ if 'src/node.h' in files: + if 'src/node.h' in files:
+ files = [f for f in files if f.endswith('.h') and f != 'src/node_version.h'] + files = [f for f in files if f.endswith('.h') and f != 'src/node_version.h']