Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: generate valid config.gypi (#31441)
- Loading branch information
Showing
5 changed files
with
77 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 0 additions & 21 deletions
21
patches/node/feat_add_new_built_with_electron_variable_to_config_gypi.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
#!/usr/bin/env python | ||
|
||
from __future__ import print_function | ||
import ast | ||
import os | ||
import pprint | ||
import re | ||
import subprocess | ||
import sys | ||
|
||
ELECTRON_DIR = os.path.abspath(os.path.join(__file__, '..', '..')) | ||
NODE_DIR = os.path.join(ELECTRON_DIR, '..', 'third_party', 'electron_node') | ||
|
||
def run_node_configure(target_cpu): | ||
configure = os.path.join(NODE_DIR, 'configure.py') | ||
args = ['--dest-cpu', target_cpu] | ||
# Enabled in Chromium's V8. | ||
if target_cpu == 'arm64' or target_cpu == 'x64': | ||
args += ['--experimental-enable-pointer-compression'] | ||
# Work around "No acceptable ASM compiler found" error on some Windows | ||
# machines, it breaks nothing since Electron does not use OpenSSL. | ||
if sys.platform == 'win32': | ||
args += ['--openssl-no-asm'] | ||
subprocess.check_call([sys.executable, configure] + args) | ||
|
||
def read_node_config_gypi(): | ||
config_gypi = os.path.join(NODE_DIR, 'config.gypi') | ||
with open(config_gypi, 'r') as f: | ||
content = f.read() | ||
return ast.literal_eval(content) | ||
|
||
def read_electron_args(): | ||
all_gn = os.path.join(ELECTRON_DIR, 'build', 'args', 'all.gn') | ||
args = {} | ||
with open(all_gn, 'r') as f: | ||
for line in f: | ||
if line.startswith('#'): | ||
continue | ||
m = re.match('([\w_]+) = (.+)', line) | ||
if m == None: | ||
continue | ||
args[m.group(1)] = m.group(2) | ||
return args | ||
|
||
def main(target_file, target_cpu): | ||
run_node_configure(target_cpu) | ||
config = read_node_config_gypi() | ||
args = read_electron_args() | ||
|
||
# Remove the generated config.gypi to make the parallel/test-process-config | ||
# test pass. | ||
os.remove(os.path.join(NODE_DIR, 'config.gypi')) | ||
|
||
v = config['variables'] | ||
# Electron specific variables: | ||
v['built_with_electron'] = 1 | ||
v['node_module_version'] = int(args['node_module_version']) | ||
# Used by certain versions of node-gyp. | ||
v['build_v8_with_gn'] = 'false' | ||
|
||
with open(target_file, 'w+') as f: | ||
f.write(pprint.pformat(config, indent=2)) | ||
|
||
if __name__ == '__main__': | ||
sys.exit(main(*sys.argv[1:])) |