From 368298bc05b0a892dbf40046016beb1b98361832 Mon Sep 17 00:00:00 2001 From: Adam Magnusson Date: Wed, 9 Apr 2025 11:31:31 +0200 Subject: [PATCH] Merged conflict --- src/.gitignore | 8 +------- src/elab.py | 2 ++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/.gitignore b/src/.gitignore index d665aea..f514b74 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,8 +1,2 @@ # Created by venv; see https://docs.python.org/3/library/venv.html -bin -include -lib -lib64 -pyvenv.cfg -__pycache__ -gantry +* diff --git a/src/elab.py b/src/elab.py index 9108c86..14980fd 100644 --- a/src/elab.py +++ b/src/elab.py @@ -121,12 +121,14 @@ def runDesign(topDef: str, arch: str, lib: str, std: str, includes): print("No GHDL environment present. Add all needed files before elaborating") os.makedirs("wave",exist_ok=True) wavePath = os.path.join(os.getcwd(), "wave") + analyzeNeededDependencies(topDef, arch, lib, std, includes) incs = generateIncludesForGHDL(includes) command = [ ## may add -v for verbose "ghdl", "--elab-run", "-C", f"--workdir=work", f"--work={lib}", f"--std={std}" ] + incs + [ "-o", f"work/{topDef}-{arch}", f"{topDef}", f"{arch}", f"--wave=wave/{topDef}-{arch}.ghw" ##, "--read-wave-opt=