Changed qflow install recipe so setup file names match pdk node names.
diff --git a/common/project_manager.py b/common/project_manager.py
index c7c3f0f..aee7ffd 100755
--- a/common/project_manager.py
+++ b/common/project_manager.py
@@ -3851,6 +3851,7 @@
if value:
design = value['values'][0] # project path
pdkdir = self.get_pdk_dir(design, path = True)
+ qflowdir = pdkdir + 'libs.tech/qflow'
# designname = value['text']
designname = self.project_name
development = self.prefs['devstdcells']
@@ -3887,20 +3888,20 @@
#TODO: replace hard-coded path with function that gets the qflow manager path
if development:
subprocess.Popen(['/usr/local/share/qflow/scripts/qflow_manager.py',
- design, '-development', '-subproject=' + pname])
+ qflowdir, design, '-development', '-subproject=' + pname])
else:
subprocess.Popen(['/usr/local/share/qflow/scripts/qflow_manager.py',
- design, '-subproject=' + pname])
+ qflowdir, design, '-subproject=' + pname])
else:
print('Synthesize design ' + designname + ' (' + design + ')')
print('Loading digital flow manager...')
# use Popen, not run, so that application does not wait for it to exit.
if development:
subprocess.Popen(['/usr/local/share/qflow/scripts/qflow_manager.py',
- pdkdir, design, designname, '-development'])
+ qflowdir, design, designname, '-development'])
else:
subprocess.Popen(['/usr/local/share/qflow/scripts/qflow_manager.py',
- pdkdir, design, designname])
+ qflowdir, design, designname])
else:
print("You must first select a project.", file=sys.stderr)
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index b4375c5..66fae82 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -616,20 +616,20 @@
rm -f ${QFLOW_STAGING_A}/${SKY130A}osu.sh
rm -f ${QFLOW_STAGING_A}/${SKY130A}osu.par
${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hd qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/${SKY130A}hd.sh
+ ${QFLOW_STAGING_A}/sky130_fd_sc_hd.sh
${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hdll qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/${SKY130A}hdll.sh
+ ${QFLOW_STAGING_A}/sky130_fd_sc_hdll.sh
${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hvl qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/${SKY130A}hvl.sh
+ ${QFLOW_STAGING_A}/sky130_fd_sc_hvl.sh
${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_hs qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/${SKY130A}hs.sh
+ ${QFLOW_STAGING_A}/sky130_fd_sc_hs.sh
${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_lp qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/${SKY130A}lp.sh
+ ${QFLOW_STAGING_A}/sky130_fd_sc_lp.sh
${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_ls qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/${SKY130A}ls.sh
+ ${QFLOW_STAGING_A}/sky130_fd_sc_ls.sh
${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_fd_sc_ms qflow/${TECH}.sh \
- ${QFLOW_STAGING_A}/${SKY130A}ms.sh
- ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_osu_sc_t18 qflow/sky130osu.sh \
+ ${QFLOW_STAGING_A}/sky130_fd_sc_ms.sh
+ ${CPP} ${SKY130A_DEFS} -DLIBRARY=sky130_osu_sc_t18 qflow/sky130_osu_sc_t18.sh \
${QFLOW_STAGING_A}/${SKY130A}osu.sh
${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/${SKY130A}hd.par
${CPP} ${SKY130A_DEFS} qflow/${TECH}.par ${QFLOW_STAGING_A}/${SKY130A}hdll.par
