joppe/remotesyn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed rmserver/rmbuild bug

Browse Source 
Signed-off-by: Joppe Blondel <joppe@blondel.nl>
This commit is contained in:
Joppe Blondel
2022-09-05 13:18:57 +02:00
parent 0e95f91fb2
commit aa9aa6aa78
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/spartan6/project.cfg
View File

@ -63,8 +63,8 @@ toplevel = tb_toplevel
vcdlevels = 20 vcdlevels = 20
runtime = all runtime = all
fuse_opts = --maxdelay work.glbl fuse_opts = --maxdelay work.glbl
isim_opts = -sdfmax /tb_toplevel/c_toplevel=%%D%%/OUT/synth/synth.sdf isim_opts = -sdfmax /tb_toplevel/c_toplevel=~D~/OUT/synth/synth.sdf
# %%D%% is replaced with the top directory of the project # ~D~ is replaced with the top directory of the project
# Fileset # Fileset
files_vhdl = SIM/tb_toplevel.vhd files_vhdl = SIM/tb_toplevel.vhd

4
remotesyn/toolchains/isim.py
View File

@ -19,8 +19,8 @@ def do(config, target, log, subprocesses, prefix='.'):
build_dir = f'{prefix}/{build_dir}' build_dir = f'{prefix}/{build_dir}'
out_dir = f'{prefix}/{out_dir}/{target}' out_dir = f'{prefix}/{out_dir}/{target}'
fuse_opts = fuse_opts.replace("%D%", prefix) fuse_opts = fuse_opts.replace("~D~", prefix)
isim_opts = isim_opts.replace("%D%", prefix) isim_opts = isim_opts.replace("~D~", prefix)
log(" - creating output directories") log(" - creating output directories")
os.makedirs(build_dir, exist_ok=True) os.makedirs(build_dir, exist_ok=True)

11
scripts/rmbuild
View File

@ -141,14 +141,13 @@ if __name__=="__main__":
print("ERROR: Could not connect to server") print("ERROR: Could not connect to server")
exit(1) exit(1)
# Send project identification
cmd(b'id' + struct.pack('>q', hash(host_key.get_base64())), channel)
# Send config
cmd(b'cf' + sstr(json.dumps({s:dict(config.items(s)) for s in config.sections()})), channel)
subprocesses = [] subprocesses = []
try: try:
# Send project identification
cmd(b'id' + struct.pack('>q', hash(host_key.get_base64())), channel)
# Send config
cmd(b'cf' + sstr(json.dumps({s:dict(config.items(s)) for s in config.sections()})), channel)
toolchain = config.get(f'target.{target}', 'toolchain', fallback='NONE') toolchain = config.get(f'target.{target}', 'toolchain', fallback='NONE')
if toolchain=='NONE': if toolchain=='NONE':
@ -177,7 +176,7 @@ if __name__=="__main__":
exit(ret) exit(ret)
except paramiko.ssh_exception.SSHException as e: except paramiko.ssh_exception.SSHException as e:
print("ERROR: Connection error...") print("ERROR: Connection error...", e)
for p in subprocesses: for p in subprocesses:
p.kill() p.kill()
exit(0) exit(0)

4
scripts/rmserver
View File

@ -183,10 +183,10 @@ class SSHServer(paramiko.ServerInterface):
return True return True
except Exception: except Exception as e:
global running global running
if running: if running:
print("ERROR: Unknown error") print("ERROR: Unknown error:", e)
return False return False
class Connection(threading.Thread): class Connection(threading.Thread):