admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer 'nodejs' as Node fallback if it exists. Closes #20. Don't redundantly duplicate Node.js and SpiderMonkey specifiers.

Browse Source
This commit is contained in:
Jukka Jylänki
2015-09-14 20:44:47 +03:00
parent 31739c48b5
commit 8697dff5c3
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
emsdk
View File

@@ -720,17 +720,27 @@ def generate_dot_emscripten(active_tools):
else: else:
temp_dir = tempfile.gettempdir().replace('\\', '/') temp_dir = tempfile.gettempdir().replace('\\', '/')
has_spidermonkey = False
has_node = False
cfg = 'import os\n' cfg = 'import os\n'
cfg += '''SPIDERMONKEY_ENGINE = ''
NODE_JS = 'node'
'''
for tool in active_tools: for tool in active_tools:
tool_cfg = tool.activated_config() tool_cfg = tool.activated_config()
if tool_cfg: if tool_cfg:
tool_cfg = tool_cfg.replace(';', '\n') tool_cfg = tool_cfg.replace(';', '\n')
if 'SPIDERMONKEY_ENGINE=' in tool_cfg: has_spidermonkey = True
if 'NODE_JS=' in tool_cfg: has_node = True
cfg += tool_cfg + '\n' cfg += tool_cfg + '\n'
# These two vars must always be defined, even though they might not exist.
if not has_spidermonkey: cfg += "SPIDERMONKEY_ENGINE = ''\n"
if not has_node:
node_fallback = which('nodejs')
if not node_fallback:
node_fallback = 'node'
cfg += "NODE_JS = '" + node_fallback + "'\n"
cfg += '''V8_ENGINE = '' cfg += '''V8_ENGINE = ''
TEMP_DIR = ''' + "'" + temp_dir + "'" + ''' TEMP_DIR = ''' + "'" + temp_dir + "'" + '''
COMPILER_ENGINE = NODE_JS COMPILER_ENGINE = NODE_JS