summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-09-02 20:16:01 -0300
committerWerner Almesberger <werner@almesberger.net>2016-09-02 20:16:01 -0300
commit9e611f0d25c8e9716f2f2792c8827c71bcc0e684 (patch)
tree8173436fd452c13172ea5e800965bcb109469f59
parentf73bc37c69b03f3fc9be643d04bb62bede128790 (diff)
downloadeeshow-9e611f0d25c8e9716f2f2792c8827c71bcc0e684.tar.gz
eeshow-9e611f0d25c8e9716f2f2792c8827c71bcc0e684.tar.bz2
eeshow-9e611f0d25c8e9716f2f2792c8827c71bcc0e684.zip
Makefile, sch2pdf, test/genpng: invoke eeplot instead of eeshow
-rw-r--r--Makefile36
-rwxr-xr-xsch2pdf8
-rwxr-xr-xtest/genpng2
3 files changed, 23 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index c41a38c..b2305fb 100644
--- a/Makefile
+++ b/Makefile
@@ -120,25 +120,25 @@ clean::
sch:
eeschema test.sch
-test: $(NAME)
- ./$(NAME) test.lib test.sch -- fig >out.fig
+test: eeplot
+ ./eeplot test.lib test.sch -- fig >out.fig
fig2dev -L png -m 2 out.fig _out.png
[ ! -r ref.png ] || \
compare -metric AE ref.png _out.png _diff.png || \
qiv -t -R -D _diff.png ref.png _out.png
-testref: $(NAME)
- ./$(NAME) test.lib test.sch -- fig | \
+testref: eeplot
+ ./eeplot test.lib test.sch -- fig | \
fig2dev -L png -m 2 >ref.png
-png: $(NAME)
- ./$(NAME) test.lib test.sch -- png -o _out.png -s 2
+png: eeplot
+ ./eeplot test.lib test.sch -- png -o _out.png -s 2
[ ! -r pngref.png ] || \
compare -metric AE pngref.png _out.png _diff.png || \
qiv -t -R -D _diff.png pngref.png _out.png
-pngref: $(NAME)
- ./$(NAME) test.lib test.sch -- png -o pngref.png -s 2
+pngref: eeplot
+ ./eeplot test.lib test.sch -- png -o pngref.png -s 2
clean::
rm -f out.fig _out.png _diff.png
@@ -150,23 +150,23 @@ KICAD_LIBS = ../../qi/kicad-libs/components
SHEET ?= 12
-neo900: $(NAME)
- ./$(NAME) $(NEO900_HW)/neo900.lib \
+neo900: eeplot
+ ./eeplot $(NEO900_HW)/neo900.lib \
$(KICAD_LIBS)/powered.lib \
$(NEO900_HW)/neo900_SS_$(SHEET).sch \
>out.fig
-neo900.pdf: $(NAME) sch2pdf neo900-template.fig
+neo900.pdf: eeplot sch2pdf neo900-template.fig
./sch2pdf -o $@ -t neo900-template.fig \
$(NEO900_HW)/neo900.lib $(KICAD_LIBS)/powered.lib \
$(NEO900_HW)/neo900.sch
-pdf: $(NAME)
- ./eeshow $(NEO900_HW)/neo900.pro -- pdf -o neo900.pdf
+pdf: eeplot
+ ./eeplot $(NEO900_HW)/neo900.pro -- pdf -o neo900.pdf
#----- Regression test based on Neo900 schematics -----------------------------
-diff: $(NAME)
+diff: eeplot
test/genpng test out
test/comp test || $(MAKE) view
@@ -181,14 +181,14 @@ newref:
SUPP = dl-init cairo-font
-leak: $(NAME)
+leak: eeplot
valgrind --leak-check=full --show-leak-kinds=all \
--num-callers=50 \
$(SUPP:%=--suppressions=%.supp) \
- eeshow $(NEO900_HW)/neo900.pro -- \
+ ./eeplot $(NEO900_HW)/neo900.pro -- \
diff $(NEO900_HW)/neo900.pro >/dev/null
-# eeshow -N 1 $(NEO900_HW)/neo900.pro -- pdf >/dev/null
-# eeshow -N 1 $(NEO900_HW)/neo900.pro -- png >/dev/null
+# ./eeplot -N 1 $(NEO900_HW)/neo900.pro -- pdf >/dev/null
+# ./eeplot -N 1 $(NEO900_HW)/neo900.pro -- png >/dev/null
#----- Cleanup ----------------------------------------------------------------
diff --git a/sch2pdf b/sch2pdf
index c085246..8613f5a 100755
--- a/sch2pdf
+++ b/sch2pdf
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# sch2pdf - Generate PDF from schematics, using eeshow
+# sch2pdf - Generate FIG then PDF from schematics, using eeplot
#
# Written 2016 by Werner Almesberger
# Copyright 2016 by Werner Almesberger
@@ -15,7 +15,7 @@
# Known bugs:
# - expects first sheet to be index page
# - only renders sub-sheets
-# - has all the limitations of eeshow (see TODO)
+# - has all the limitations of eeplot (see TODO)
#
@@ -56,7 +56,7 @@ while [ "$2" ]; do
shift
done
-./eeshow $libs "$1" \
+./eeplot $libs "$1" \
-- fig $template "TITLE=`basename \"$1\" .sch`" NUMBER=$num |
fig2dev -L pdf >"$out"
@@ -83,7 +83,7 @@ while read line; do
num=`expr $num + 1`
$quiet || echo "$file" 1>&2
- ./eeshow $libs `dirname "$1"`/$file \
+ ./eeplot $libs `dirname "$1"`/$file \
-- fig $template "TITLE=$name" NUMBER=$num |
fig2dev -L pdf >_tmp.pdf
pdfunite "$out" _tmp.pdf _tmp2.pdf
diff --git a/test/genpng b/test/genpng
index 0d73ec1..36e0dfa 100755
--- a/test/genpng
+++ b/test/genpng
@@ -28,7 +28,7 @@ while [ $sheet -le 38 ]; do
in=$dir/neo900-ee/hw/neo900_SS_`expr $sheet - 1`.sch
fi
file=$dir/$prefix$sn.png
- $dir/../eeshow $dir/neo900-ee/hw/neo900.lib \
+ $dir/../eeplot $dir/neo900-ee/hw/neo900.lib \
$dir/kicad-libs/components/powered.lib "$in" \
-- fig -t $dir/frame.fig SHEET=$sn |
fig2dev -L png -m 2 >$file