[qflow] 04/13: Applied patch from green AT moxielogic.com from Bugzilla bug ID 44, adding DESTDIR to the Makefiles for correct installation.
Ruben Undheim
rubund-guest at moszumanska.debian.org
Thu Apr 16 17:35:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository qflow.
commit f4fa01f41c80dd5a24776f16afaad2292fc4e831
Author: Tim Edwards <tim at opencircuitdesign.com>
Date: Mon Feb 2 08:09:12 2015 -0500
Applied patch from green AT moxielogic.com from Bugzilla bug ID 44,
adding DESTDIR to the Makefiles for correct installation.
---
.gitignore | 1 +
scripts/Makefile.in | 12 ++++++------
scripts/blif2cel.tcl | 13 +++++++++++--
src/Makefile.in | 16 ++++++++--------
tech/Makefile.in | 2 +-
tech/osu035/Makefile.in | 4 ++--
tech/osu050/Makefile.in | 4 ++--
7 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4341368..dd5d2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ config.status
config.log
src/Makefile
scripts/Makefile
+scripts/qflow.sh
tech/Makefile
Makefile
src/*.o
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 60010af..782c5bd 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -46,19 +46,19 @@ qflow.sh: qflow.sh.in
sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-e '/QFLOW_DEFAULT_PARSER/s#QFLOW_DEFAULT_PARSER#$(DEFAULTPARSER)#' \
qflow.sh.in > qflow.sh
-
+
install: $(TCL_SCRIPTS) $(SHELL_SCRIPTS) $(MAIN_SCRIPT)
@echo "Installing qflow scripts"
- $(INSTALL) -d ${SCRIPTINSTALL}
+ $(INSTALL) -d $(DESTDIR)${SCRIPTINSTALL}
for target in $(TCL_SCRIPTS); do \
- $(INSTALL) $$target ${SCRIPTINSTALL} ;\
+ $(INSTALL) $$target $(DESTDIR)${SCRIPTINSTALL} ;\
done
for target in $(SHELL_SCRIPTS); do \
- $(INSTALL) $$target ${SCRIPTINSTALL} ;\
+ $(INSTALL) $$target $(DESTDIR)${SCRIPTINSTALL} ;\
done
@echo "Installing qflow executable"
- $(INSTALL) -d ${EXECINSTALL}
- $(INSTALL) ${MAIN_SCRIPT} ${EXECINSTALL}
+ $(INSTALL) -d $(DESTDIR)${EXECINSTALL}
+ $(INSTALL) ${MAIN_SCRIPT} $(DESTDIR)${EXECINSTALL}
clean:
$(RM) $(MAIN_SCRIPT)
diff --git a/scripts/blif2cel.tcl b/scripts/blif2cel.tcl
index 5c37cc5..62c9cf7 100755
--- a/scripts/blif2cel.tcl
+++ b/scripts/blif2cel.tcl
@@ -167,6 +167,8 @@ proc parse_layer {leffile layername} {
global pitchx pitchy units
set pitch 0
+ set type NONE
+
while {[gets $leffile line] >= 0} {
regexp {[ \t]*TYPE[ \t]+(.+)[ \t]*;} $line lmatch type
regexp {[ \t]*DIRECTION[ \t]+(.+)[ \t]*;} $line lmatch direc
@@ -212,8 +214,8 @@ proc parse_layer {leffile layername} {
}
}
}
- } else {
- puts stdout "LEF file has layer section with no pitch information"
+ } elseif {$type == "ROUTING"} {
+ puts stdout "LEF file route layer ${layername} has no pitch information"
}
}
@@ -256,6 +258,8 @@ proc parse_macro {leffile macroname} {
set ${macroname}(top) $top
set ${macroname}(bottom) $bottom
} elseif [regexp {[ \t]*PIN[ \t]+(.+)[ \t]*$} $line lmatch pinname] {
+ # Ignore additional information from LEF version 5.6 syntax
+ set pinname [lindex $pinname 0]
parse_pin $pinname $macroname $leffile $ox $oy
} elseif [regexp {[ \t]*END[ \t]+(.+)[ \t]*$} $line lmatch macrotest] {
if {"$macrotest" == "$macroname"} {
@@ -291,6 +295,8 @@ while {[gets $flef line] >= 0} {
skip_section $flef $vianame
} elseif [regexp {[ \t]*VIARULE[ \t]+([^ \t]+)} $line lmatch viarulename] {
skip_section $flef $viarulename
+ } elseif [regexp {[ \t]*NONDEFAULTRULE[ \t]+([^ \t]+)} $line lmatch rulename] {
+ skip_section $flef $rulename
} elseif [regexp {[ \t]*SITE[ \t]+(.+)[ \t]*$} $line lmatch sitename] {
skip_section $flef $sitename
} elseif [regexp {[ \t]*UNITS[ \t]*$} $line lmatch] {
@@ -320,6 +326,9 @@ while {[gets $flef line] >= 0} {
incr matches
} elseif [regexp {[ \t]*MANUFACTURINGGRID} $line lmatch] {
incr matches
+ } elseif [regexp {[ \t]*MAXVIASTACK} $line lmatch] {
+ # We *should* care about this one; need to pass it on to the router
+ incr matches
} else {
puts stderr "Unexpected input in LEF file: Only macro defs were expected!"
puts stdout "Line is: $line"
diff --git a/src/Makefile.in b/src/Makefile.in
index 6b96304..252b4d0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -53,22 +53,22 @@ liberty2tech$(EXEEXT): liberty2tech.o
install: $(TARGETS)
@echo "Installing verilog and BDNET file format handlers"
- $(INSTALL) -d ${BININSTALL}
+ $(INSTALL) -d $(DESTDIR)${BININSTALL}
@for target in $(TARGETS); do \
- $(INSTALL) $$target ${BININSTALL} ;\
+ $(INSTALL) $$target $(DESTDIR)${BININSTALL} ;\
done
@echo "Installing links to graywolf, qrouter, odin_ii, and abc"
- (cd ${BININSTALL}; $(RM) -f graywolf; ln -s $(QFLOW_GRAYWOLF_PATH) graywolf)
- (cd ${BININSTALL}; $(RM) -f qrouter; ln -s $(QFLOW_QROUTER_PATH) qrouter)
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f graywolf; ln -s $(QFLOW_GRAYWOLF_PATH) graywolf)
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f qrouter; ln -s $(QFLOW_QROUTER_PATH) qrouter)
@if test "${HAVE_ABC}" = "1"; then \
- (cd ${BININSTALL}; $(RM) -f abc; ln -s $(QFLOW_ABC_PATH) abc); \
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f abc; ln -s $(QFLOW_ABC_PATH) abc); \
fi
@if test "${HAVE_ODIN_II}" = "1"; then \
- (cd ${BININSTALL}; $(RM) -f odin_ii; ln -s $(QFLOW_ODIN_PATH) odin_ii); \
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f odin_ii; ln -s $(QFLOW_ODIN_PATH) odin_ii); \
fi
- (cd ${BININSTALL}; $(RM) -f magic; ln -s $(QFLOW_MAGIC_PATH) magic)
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f magic; ln -s $(QFLOW_MAGIC_PATH) magic)
@if test "${HAVE_YOSYS}" = "1"; then \
- (cd ${BININSTALL}; $(RM) -f yosys; ln -s $(QFLOW_YOSYS_PATH) yosys); \
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f yosys; ln -s $(QFLOW_YOSYS_PATH) yosys); \
fi
uninstall:
diff --git a/tech/Makefile.in b/tech/Makefile.in
index a91647e..1c34acf 100644
--- a/tech/Makefile.in
+++ b/tech/Makefile.in
@@ -23,7 +23,7 @@ all:
install:
@echo "Installing built-in tech files"
- $(INSTALL) -d ${TECHINSTALL}
+ $(INSTALL) -d $(DESTDIR)${TECHINSTALL}
for target in $(TECH_DIRS); do \
(cd $$target ; $(MAKE) install) ;\
done
diff --git a/tech/osu035/Makefile.in b/tech/osu035/Makefile.in
index 5319073..3a9039e 100644
--- a/tech/osu035/Makefile.in
+++ b/tech/osu035/Makefile.in
@@ -28,9 +28,9 @@ all: osu035.magicrc.in
install: ${TECH_FILES}
@echo "Installing osu035 tech files"
- $(INSTALL) -d $(TECHINSTALL)/osu035
+ $(INSTALL) -d $(DESTDIR)$(TECHINSTALL)/osu035
for target in $(TECH_FILES); do \
- $(INSTALL) $$target $(TECHINSTALL)/osu035 ;\
+ $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu035 ;\
done
clean:
diff --git a/tech/osu050/Makefile.in b/tech/osu050/Makefile.in
index 26214aa..8afee9e 100644
--- a/tech/osu050/Makefile.in
+++ b/tech/osu050/Makefile.in
@@ -28,9 +28,9 @@ all: osu050.magicrc.in
install: ${TECH_FILES}
@echo "Installing osu050 tech files"
- $(INSTALL) -d $(TECHINSTALL)/osu050
+ $(INSTALL) -d $(DESTDIR)$(TECHINSTALL)/osu050
for target in $(TECH_FILES); do \
- $(INSTALL) $$target $(TECHINSTALL)/osu050 ;\
+ $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu050 ;\
done
clean:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qflow.git
More information about the debian-science-commits
mailing list