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

Allow system npm in "emsdk install emscripten" (#723)

Browse Source 
"emsdk install emscripten-master-64bit" is currently dependent on
whether emscripten node is installed or not.

This change allow using system-provided node / npm command to proceed
the installation. Also clarify the error message.
This commit is contained in:
Jia Yuan Lo
2021-02-24 03:18:28 +08:00
committed by GitHub
parent ef638b3860
commit 63b6cd2a4e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
emsdk.py
View File

@@ -1243,10 +1243,16 @@ def find_latest_installed_tool(name):
def emscripten_npm_install(tool, directory): def emscripten_npm_install(tool, directory):
node_tool = find_latest_installed_tool('node') node_tool = find_latest_installed_tool('node')
if not node_tool: if not node_tool:
print('Failed to run "npm ci" in installed Emscripten root directory ' + tool.installation_path() + '! Please install node.js first!') npm_fallback = which('npm')
return False if not npm_fallback:
print('Failed to find npm command!')
print('Running "npm ci" in installed Emscripten root directory ' + tool.installation_path() + ' is required!')
print('Please install node.js first!')
return False
node_path = os.path.dirname(npm_fallback)
else:
node_path = os.path.join(node_tool.installation_path(), 'bin')
node_path = os.path.join(node_tool.installation_path(), 'bin')
npm = os.path.join(node_path, 'npm' + ('.cmd' if WINDOWS else '')) npm = os.path.join(node_path, 'npm' + ('.cmd' if WINDOWS else ''))
env = os.environ.copy() env = os.environ.copy()
env["PATH"] = node_path + os.pathsep + env["PATH"] env["PATH"] = node_path + os.pathsep + env["PATH"]