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

artiq_flash: make scripts_path a function (for doc generating)

This commit is contained in:
Robert Jördens 2017-01-26 17:53:33 +01:00
parent b4df00009b
commit d16f5ce540
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/frontend/artiq_flash.py
View File

@ -11,10 +11,11 @@ from artiq import __artiq_dir__ as artiq_dir
from artiq.frontend.bit2bin import bit2bin from artiq.frontend.bit2bin import bit2bin
scripts_path = ["share", "openocd", "scripts"] def scripts_path():
if os.name == "nt": scripts_path = ["share", "openocd", "scripts"]
if os.name == "nt":
scripts_path.insert(0, "Library") scripts_path.insert(0, "Library")
scripts_path = os.path.abspath(os.path.join( scripts_path = os.path.abspath(os.path.join(
os.path.dirname(shutil.which("openocd")), os.path.dirname(shutil.which("openocd")),
"..", *scripts_path)) "..", *scripts_path))
@ -139,7 +140,7 @@ def main():
target_file = opts.target_file target_file = opts.target_file
subprocess.check_call([ subprocess.check_call([
"openocd", "openocd",
"-s", scripts_path, "-s", scripts_path(),
"-f", target_file, "-f", target_file,
"-c", "; ".join(prog), "-c", "; ".join(prog),
]) ])