Merged conflict

This commit is contained in:
Adam Magnusson 2025-04-09 11:31:31 +02:00
parent acd2df6112
commit 368298bc05
2 changed files with 3 additions and 7 deletions

8
src/.gitignore vendored
View File

@ -1,8 +1,2 @@
# Created by venv; see https://docs.python.org/3/library/venv.html
bin
include
lib
lib64
pyvenv.cfg
__pycache__
gantry
*

View File

@ -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=<See"
]
print(command)
subprocess.run(command)
command = [
"gtkwave", f"{topDef}-{arch}.ghw", "--rcvar",