michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(bin/linja): prefer local tools over system-wide ones

Browse source 
Close #396

Related issue: #394
This commit is contained in:
Soonho Kong 2015-01-23 06:27:27 -05:00
parent b66b3a6c58
commit 971b602773
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bin/linja
View file

@ -328,7 +328,11 @@ def which(program):
return exe_file
return None
def find_location(exec_name):
def find_location(exec_name, findLocal=True):
if findLocal:
pathname = os.path.join(os.path.dirname(g_linja_path), exec_name)
if os.path.isfile(pathname):
return pathname
pathname = which(exec_name) or os.path.join(g_lean_bin_dir, exec_name)
pathname = os.path.abspath(pathname)
return pathname
@ -343,11 +347,11 @@ def check_requirements():
ninja_exec_name = "ninja.exe"
if g_lean_path == "USE DEFAULT":
g_lean_path = find_location(lean_exec_name)
g_lean_path = find_location(lean_exec_name, True)
if g_leantags_path == "USE DEFAULT":
g_leantags_path = find_location(leantags_exec_name)
g_leantags_path = find_location(leantags_exec_name, True)
if g_ninja_path == "USE DEFAULT":
g_ninja_path = find_location(ninja_exec_name)
g_ninja_path = find_location(ninja_exec_name, False)
if not os.path.isfile(g_lean_path):
error("cannot find lean executable at " + os.path.abspath(g_lean_path))
if not os.path.isfile(g_leantags_path):