M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

artiq_flash: improve openocd not found error message

This commit is contained in:
Sebastien Bourdeauducq 2021-05-13 14:45:23 +08:00
parent 67d474e6cf
commit 935e18c1be
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/frontend/artiq_flash.py
View File

@ -79,13 +79,18 @@ Prerequisites:
help="actions to perform, default: flash everything") help="actions to perform, default: flash everything")
return parser return parser
def which_openocd():
openocd = shutil.which("openocd")
if not openocd:
raise FileNotFoundError("OpenOCD is required but was not found in PATH. Is it installed?")
return openocd
def scripts_path(): def scripts_path():
p = ["share", "openocd", "scripts"] p = ["share", "openocd", "scripts"]
if os.name == "nt": if os.name == "nt":
p.insert(0, "Library") p.insert(0, "Library")
p = os.path.abspath(os.path.join( p = os.path.abspath(os.path.join(
os.path.dirname(os.path.realpath(shutil.which("openocd"))), os.path.dirname(os.path.realpath(which_openocd())),
"..", *p)) "..", *p))
return p return p
@ -93,7 +98,7 @@ def scripts_path():
def proxy_path(): def proxy_path():
p = ["share", "bscan-spi-bitstreams"] p = ["share", "bscan-spi-bitstreams"]
p = os.path.abspath(os.path.join( p = os.path.abspath(os.path.join(
os.path.dirname(os.path.realpath(shutil.which("openocd"))), os.path.dirname(os.path.realpath(which_openocd())),
"..", *p)) "..", *p))
return p return p