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

Merge pull request #1705 from hammerandchisel/node-not-in-path

Browse source 
compile-coffee.py searches for node even on non-windows systems
This commit is contained in:
Cheng Zhao 2015-05-21 10:38:09 +08:00
commit 5e7d6f89e8
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
tools/compile-coffee.py
View file

@ -6,11 +6,15 @@ import sys
SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__))
WINDOWS_NODE_PATHs = [
WINDOWS_NODE_PATHs = os.environ['PATH'].split(os.pathsep) + [
'C:/Program Files (x86)/nodejs',
'C:/Program Files/nodejs',
] + os.environ['PATH'].split(os.pathsep)
]
NIX_NODE_PATHs = os.environ['PATH'].split(os.pathsep) + [
'/usr/local/bin',
'/usr/bin',
'/bin',
]
def main():
input_file = sys.argv[1]
@ -18,20 +22,24 @@ def main():
coffee = os.path.join(SOURCE_ROOT, 'node_modules', 'coffee-script', 'bin',
'coffee')
node = 'node'
if sys.platform in ['win32', 'cygwin']:
node = find_node()
if not node:
print 'Node.js not found in PATH for building atom-shell'
return 1
subprocess.check_call(['node', coffee, '-c', '-o', output_dir, input_file],
executable=node)
node = find_node(WINDOWS_NODE_PATHs, 'node.exe')
else:
subprocess.check_call(['node', coffee, '-c', '-o', output_dir, input_file])
node = find_node(NIX_NODE_PATHs, 'node')
if not node:
print 'Node.js not found in PATH for building electron'
return 1
subprocess.check_call(['node', coffee, '-c', '-o', output_dir, input_file],
executable=node)
def find_node():
for path in WINDOWS_NODE_PATHs:
full_path = os.path.join(path, 'node.exe')
def find_node(paths, target):
for path in paths:
full_path = os.path.join(path, target)
if os.path.exists(full_path):
return full_path
return None