[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-435-gedf9902)
The branch, master has been updated
via edf990235cac2fe6ac2ca6e120f198fd14d05ed7 (commit)
via 45dae54fa28ec09313806a80781f9dd6b8d35485 (commit)
via 24d24fcc3ab6ecbec321d38fc011513df521c122 (commit)
from 59a09888c3a0f70af8312da604a98cb2d0c411d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gnetlist/scripts/.gitignore | 3 +
gnetlist/tests/common/outputs/Makefile.am | 1 +
.../outputs/PCB/{JD.retcode => JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/PCB/Makefile.am | 1 +
.../JD.retcode => PCBboard/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/PCBboard/Makefile.am | 1 +
.../{PCB/JD.retcode => allegro/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/allegro/Makefile.am | 1 +
.../{PCB/JD.retcode => bae/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/bae/Makefile.am | 1 +
.../{PCB/JD.retcode => bom/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/bom/Makefile.am | 1 +
.../common/outputs/bom2/JD_nomunge-output.net | 24 ++++----
.../{PCB/JD.retcode => bom2/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/bom2/Makefile.am | 1 +
.../{PCB/JD.retcode => calay/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/calay/Makefile.am | 1 +
.../cascade/{JD.retcode => JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/cascade/Makefile.am | 1 +
.../{PCB/JD.retcode => drc/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/drc/Makefile.am | 1 +
.../{PCB/JD.retcode => drc2/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/drc2/Makefile.am | 1 +
.../{PCB/JD.retcode => eagle/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/eagle/Makefile.am | 1 +
.../JD.retcode => futurenet2/JD_nomunge.retcode} | 0
.../tests/common/outputs/futurenet2/Makefile.am | 1 +
.../{PCB/JD.retcode => geda/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/geda/Makefile.am | 1 +
.../{PCB/JD.retcode => gossip/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/gossip/Makefile.am | 1 +
.../common/outputs/gsch2pcb/JD_nomunge-output.net | 41 +++++++++-----
.../JD.retcode => gsch2pcb/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/gsch2pcb/Makefile.am | 1 +
.../{JD-output.net => JD_nomunge-output.net} | 0
.../JD.retcode => liquidpcb/JD_nomunge.retcode} | 0
.../tests/common/outputs/liquidpcb/Makefile.am | 1 +
.../JD.retcode => mathematica/JD_nomunge.retcode} | 0
.../tests/common/outputs/mathematica/Makefile.am | 1 +
.../JD.retcode => maxascii/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/maxascii/Makefile.am | 1 +
.../{PCB/JD.retcode => osmond/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/osmond/Makefile.am | 1 +
.../common/outputs/pads/JD_nomunge-output.net | 60 ++++++++++----------
.../{PCB/JD.retcode => pads/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/pads/Makefile.am | 1 +
.../JD.retcode => partslist1/JD_nomunge.retcode} | 0
.../tests/common/outputs/partslist1/Makefile.am | 1 +
.../JD.retcode => partslist2/JD_nomunge.retcode} | 0
.../tests/common/outputs/partslist2/Makefile.am | 1 +
.../JD.retcode => partslist3/JD_nomunge.retcode} | 0
.../tests/common/outputs/partslist3/Makefile.am | 1 +
.../{PCB/JD.retcode => pcbpins/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/pcbpins/Makefile.am | 1 +
.../JD.retcode => protelII/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/protelII/Makefile.am | 1 +
.../{PCB/JD.retcode => redac/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/redac/Makefile.am | 1 +
.../common/outputs/spice-sdb/JD_nomunge-output.net | 4 +-
.../JD.retcode => spice-sdb/JD_nomunge.retcode} | 0
.../tests/common/outputs/spice-sdb/Makefile.am | 1 +
.../{PCB/JD.retcode => spice/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/spice/Makefile.am | 1 +
.../{PCB/JD.retcode => switcap/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/switcap/Makefile.am | 1 +
.../{JD-output.net => JD_nomunge-output.net} | 0
.../{PCB/JD.retcode => systemc/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/systemc/Makefile.am | 1 +
.../{PCB/JD.retcode => tango/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/tango/Makefile.am | 1 +
.../{PCB/JD.retcode => vams/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/vams/Makefile.am | 1 +
.../{PCB/JD.retcode => verilog/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/verilog/Makefile.am | 1 +
.../{PCB/JD.retcode => vhdl/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/vhdl/Makefile.am | 1 +
.../{PCB/JD.retcode => vipec/JD_nomunge.retcode} | 0
gnetlist/tests/common/outputs/vipec/Makefile.am | 1 +
gnetlist/tests/common/tests.list | 2 +-
79 files changed, 110 insertions(+), 60 deletions(-)
copy gnetlist/tests/common/outputs/PCB/{JD.retcode => JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => PCBboard/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => allegro/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => bae/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => bom/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => bom2/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => calay/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/cascade/{JD.retcode => JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => drc/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => drc2/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => eagle/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => futurenet2/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => geda/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => gossip/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => gsch2pcb/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/liquidpcb/{JD-output.net => JD_nomunge-output.net} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => liquidpcb/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => mathematica/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => maxascii/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => osmond/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => pads/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => partslist1/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => partslist2/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => partslist3/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => pcbpins/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => protelII/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => redac/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => spice-sdb/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => spice/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => switcap/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/systemc/{JD-output.net => JD_nomunge-output.net} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => systemc/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => tango/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => vams/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => verilog/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => vhdl/JD_nomunge.retcode} (100%)
copy gnetlist/tests/common/outputs/{PCB/JD.retcode => vipec/JD_nomunge.retcode} (100%)
=================
Commit Messages
=================
commit edf990235cac2fe6ac2ca6e120f198fd14d05ed7
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Sat Dec 20 14:56:02 2008 -0500
Added missing liquidpcb to the subdirs in order to make distcheck work better
:100644 100644 d2f9934... 51bdf45... M gnetlist/tests/common/outputs/Makefile.am
commit 45dae54fa28ec09313806a80781f9dd6b8d35485
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Sat Dec 20 14:42:40 2008 -0500
Ignored a few machine generated scripts
:100644 100644 8a135b7... 7310af3... M gnetlist/scripts/.gitignore
commit 24d24fcc3ab6ecbec321d38fc011513df521c122
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Sat Dec 20 14:40:42 2008 -0500
Fixed a typo in tests.list which caused the JD_nomunge test to not run
Fixing this typo also required the regen of all Makefile.am, creation
of JD_nomunge.retcode, and changed a few golden files.
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/PCB/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/PCB/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/PCBboard/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/PCBboard/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/allegro/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/allegro/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/bae/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/bae/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/bom/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/bom/Makefile.am
:100644 100644 5c6ad74... 3d13386... M gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/bom2/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/bom2/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/calay/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/calay/Makefile.am
:000000 100644 0000000... d00491f... A gnetlist/tests/common/outputs/cascade/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/cascade/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/drc/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/drc/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/drc2/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/drc2/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/eagle/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/eagle/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/futurenet2/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/futurenet2/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/geda/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/geda/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/gossip/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/gossip/Makefile.am
:100644 100644 5b0eab2... 825885f... M gnetlist/tests/common/outputs/gsch2pcb/JD_nomunge-output.net
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/gsch2pcb/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/gsch2pcb/Makefile.am
:000000 100644 0000000... 77947fb... A gnetlist/tests/common/outputs/liquidpcb/JD_nomunge-output.net
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/liquidpcb/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/liquidpcb/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/mathematica/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/mathematica/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/maxascii/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/maxascii/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/osmond/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/osmond/Makefile.am
:100644 100644 c4fc30c... f3a5213... M gnetlist/tests/common/outputs/pads/JD_nomunge-output.net
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/pads/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/pads/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/partslist1/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/partslist1/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/partslist2/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/partslist2/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/partslist3/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/partslist3/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/pcbpins/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/pcbpins/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/protelII/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/protelII/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/redac/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/redac/Makefile.am
:100644 100644 e1bb285... cfaab32... M gnetlist/tests/common/outputs/spice-sdb/JD_nomunge-output.net
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/spice-sdb/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/spice-sdb/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/spice/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/spice/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/switcap/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/switcap/Makefile.am
:000000 100644 0000000... 8c3783a... A gnetlist/tests/common/outputs/systemc/JD_nomunge-output.net
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/systemc/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/systemc/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/tango/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/tango/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/vams/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/vams/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/verilog/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/verilog/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/vhdl/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/vhdl/Makefile.am
:000000 100644 0000000... 573541a... A gnetlist/tests/common/outputs/vipec/JD_nomunge.retcode
:100644 100644 bf3dd39... fd2bedc... M gnetlist/tests/common/outputs/vipec/Makefile.am
:100644 100644 8607735... 3ace5b7... M gnetlist/tests/common/tests.list
=========
Changes
=========
commit edf990235cac2fe6ac2ca6e120f198fd14d05ed7
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Sat Dec 20 14:56:02 2008 -0500
Added missing liquidpcb to the subdirs in order to make distcheck work better
diff --git a/gnetlist/tests/common/outputs/Makefile.am b/gnetlist/tests/common/outputs/Makefile.am
index d2f9934..51bdf45 100644
--- a/gnetlist/tests/common/outputs/Makefile.am
+++ b/gnetlist/tests/common/outputs/Makefile.am
@@ -12,6 +12,7 @@ SUBDIRS= \
geda \
gossip \
gsch2pcb \
+ liquidpcb \
mathematica \
maxascii \
osmond \
commit 45dae54fa28ec09313806a80781f9dd6b8d35485
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Sat Dec 20 14:42:40 2008 -0500
Ignored a few machine generated scripts
diff --git a/gnetlist/scripts/.gitignore b/gnetlist/scripts/.gitignore
index 8a135b7..7310af3 100644
--- a/gnetlist/scripts/.gitignore
+++ b/gnetlist/scripts/.gitignore
@@ -1,4 +1,7 @@
Makefile
Makefile.in
sw2asc
+annotate.sh
+bom_xref.sh
+bompp.sh
*~
commit 24d24fcc3ab6ecbec321d38fc011513df521c122
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Sat Dec 20 14:40:42 2008 -0500
Fixed a typo in tests.list which caused the JD_nomunge test to not run
Fixing this typo also required the regen of all Makefile.am, creation
of JD_nomunge.retcode, and changed a few golden files.
diff --git a/gnetlist/tests/common/outputs/PCB/JD_nomunge.retcode b/gnetlist/tests/common/outputs/PCB/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/PCB/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/PCB/Makefile.am b/gnetlist/tests/common/outputs/PCB/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/PCB/Makefile.am
+++ b/gnetlist/tests/common/outputs/PCB/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/PCBboard/JD_nomunge.retcode b/gnetlist/tests/common/outputs/PCBboard/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/PCBboard/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/PCBboard/Makefile.am b/gnetlist/tests/common/outputs/PCBboard/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/PCBboard/Makefile.am
+++ b/gnetlist/tests/common/outputs/PCBboard/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/allegro/JD_nomunge.retcode b/gnetlist/tests/common/outputs/allegro/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/allegro/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/allegro/Makefile.am b/gnetlist/tests/common/outputs/allegro/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/allegro/Makefile.am
+++ b/gnetlist/tests/common/outputs/allegro/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/bae/JD_nomunge.retcode b/gnetlist/tests/common/outputs/bae/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/bae/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/bae/Makefile.am b/gnetlist/tests/common/outputs/bae/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/bae/Makefile.am
+++ b/gnetlist/tests/common/outputs/bae/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/bom/JD_nomunge.retcode b/gnetlist/tests/common/outputs/bom/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/bom/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/bom/Makefile.am b/gnetlist/tests/common/outputs/bom/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/bom/Makefile.am
+++ b/gnetlist/tests/common/outputs/bom/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net b/gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net
index 5c6ad74..3d13386 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net
@@ -1,12 +1,12 @@
-refdes:refdes:value:device
-Rb:Rb:5.6k:RESISTOR
-Cp:Cp:20p:CAPACITOR
-Rlm:Rlm:500k:RESISTOR
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE
-Rlp:Rlp:1meg:RESISTOR
-X1:X1:unknown:LVD
-M1:M1:unknown:PMOS_TRANSISTOR
-Rt:Rt:1k:RESISTOR
-A1:A1:unknown:model
-Cm:Cm:20p:CAPACITOR
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse
+refdes:refdes:value:device:qty
+Rb:Rb:5.6k:RESISTOR:1
+Cp:Cp:20p:CAPACITOR:1
+Rlm:Rlm:500k:RESISTOR:1
+Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
+Rlp:Rlp:1meg:RESISTOR:1
+X1:X1:unknown:LVD:1
+M1:M1:unknown:PMOS_TRANSISTOR:1
+Rt:Rt:1k:RESISTOR:1
+A1:A1:unknown:model:1
+Cm:Cm:20p:CAPACITOR:1
+V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_nomunge.retcode b/gnetlist/tests/common/outputs/bom2/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/bom2/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/bom2/Makefile.am b/gnetlist/tests/common/outputs/bom2/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/bom2/Makefile.am
+++ b/gnetlist/tests/common/outputs/bom2/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/calay/JD_nomunge.retcode b/gnetlist/tests/common/outputs/calay/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/calay/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/calay/Makefile.am b/gnetlist/tests/common/outputs/calay/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/calay/Makefile.am
+++ b/gnetlist/tests/common/outputs/calay/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/cascade/JD_nomunge.retcode b/gnetlist/tests/common/outputs/cascade/JD_nomunge.retcode
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/gnetlist/tests/common/outputs/cascade/JD_nomunge.retcode
@@ -0,0 +1 @@
+1
diff --git a/gnetlist/tests/common/outputs/cascade/Makefile.am b/gnetlist/tests/common/outputs/cascade/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/cascade/Makefile.am
+++ b/gnetlist/tests/common/outputs/cascade/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/drc/JD_nomunge.retcode b/gnetlist/tests/common/outputs/drc/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/drc/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/drc/Makefile.am b/gnetlist/tests/common/outputs/drc/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/drc/Makefile.am
+++ b/gnetlist/tests/common/outputs/drc/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/drc2/JD_nomunge.retcode b/gnetlist/tests/common/outputs/drc2/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/drc2/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/drc2/Makefile.am b/gnetlist/tests/common/outputs/drc2/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/drc2/Makefile.am
+++ b/gnetlist/tests/common/outputs/drc2/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/eagle/JD_nomunge.retcode b/gnetlist/tests/common/outputs/eagle/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/eagle/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/eagle/Makefile.am b/gnetlist/tests/common/outputs/eagle/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/eagle/Makefile.am
+++ b/gnetlist/tests/common/outputs/eagle/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/futurenet2/JD_nomunge.retcode b/gnetlist/tests/common/outputs/futurenet2/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/futurenet2/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/futurenet2/Makefile.am b/gnetlist/tests/common/outputs/futurenet2/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/futurenet2/Makefile.am
+++ b/gnetlist/tests/common/outputs/futurenet2/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/geda/JD_nomunge.retcode b/gnetlist/tests/common/outputs/geda/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/geda/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/geda/Makefile.am b/gnetlist/tests/common/outputs/geda/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/geda/Makefile.am
+++ b/gnetlist/tests/common/outputs/geda/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/gossip/JD_nomunge.retcode b/gnetlist/tests/common/outputs/gossip/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/gossip/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/gossip/Makefile.am b/gnetlist/tests/common/outputs/gossip/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/gossip/Makefile.am
+++ b/gnetlist/tests/common/outputs/gossip/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/JD_nomunge-output.net b/gnetlist/tests/common/outputs/gsch2pcb/JD_nomunge-output.net
index 5b0eab2..825885f 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/JD_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/JD_nomunge-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_none(none,V1,pulse 3.3 0 1u 10p 10p 1.25u 2.5u)
PKG_unknown(unknown,Cm,20p)
PKG_unknown(unknown,A1,unknown)
@@ -16,27 +21,33 @@ PKG_none(none,Vdd,DC 3.3V)
PKG_unknown(unknown,Rlm,500k)
PKG_unknown(unknown,Cp,20p)
PKG_unknown(unknown,Rb,5.6k)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/JD_nomunge.retcode b/gnetlist/tests/common/outputs/gsch2pcb/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/gsch2pcb/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/Makefile.am b/gnetlist/tests/common/outputs/gsch2pcb/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/Makefile.am
+++ b/gnetlist/tests/common/outputs/gsch2pcb/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/liquidpcb/JD_nomunge-output.net b/gnetlist/tests/common/outputs/liquidpcb/JD_nomunge-output.net
new file mode 100644
index 0000000..77947fb
--- /dev/null
+++ b/gnetlist/tests/common/outputs/liquidpcb/JD_nomunge-output.net
@@ -0,0 +1,43 @@
+<LiquidPCB>
+ <netlist name="Main netlist">
+ <net name="Vdd1">
+ <netnode component="Rlp" pin=2 />
+ <netnode component="M1" pin=B />
+ <netnode component="M1" pin=S />
+ <netnode component="Vdd" pin=1 />
+ <netnode component="X1" pin=6 />
+ </net>
+ <net name="GND">
+ <netnode component="Cm" pin=2 />
+ <netnode component="Cp" pin=2 />
+ <netnode component="Rlm" pin=2 />
+ <netnode component="Vdd" pin=2 />
+ <netnode component="V1" pin=2 />
+ <netnode component="Rb" pin=1 />
+ <netnode component="X1" pin=7 />
+ <netnode component="X1" pin=2 />
+ </net>
+ <net name="LVH">
+ <netnode component="Rb" pin=2 />
+ <netnode component="M1" pin=D />
+ <netnode component="M1" pin=G />
+ <netnode component="X1" pin=3 />
+ </net>
+ <net name="i">
+ <netnode component="V1" pin=1 />
+ <netnode component="X1" pin=1 />
+ </net>
+ <net name="p">
+ <netnode component="Cp" pin=1 />
+ <netnode component="Rt" pin=1 />
+ <netnode component="Rlp" pin=1 />
+ <netnode component="X1" pin=5 />
+ </net>
+ <net name="m">
+ <netnode component="Cm" pin=1 />
+ <netnode component="Rlm" pin=1 />
+ <netnode component="Rt" pin=2 />
+ <netnode component="X1" pin=4 />
+ </net>
+ </netlist>
+</LiquidPCB>
diff --git a/gnetlist/tests/common/outputs/liquidpcb/JD_nomunge.retcode b/gnetlist/tests/common/outputs/liquidpcb/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/liquidpcb/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/liquidpcb/Makefile.am b/gnetlist/tests/common/outputs/liquidpcb/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/liquidpcb/Makefile.am
+++ b/gnetlist/tests/common/outputs/liquidpcb/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/mathematica/JD_nomunge.retcode b/gnetlist/tests/common/outputs/mathematica/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/mathematica/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/mathematica/Makefile.am b/gnetlist/tests/common/outputs/mathematica/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/mathematica/Makefile.am
+++ b/gnetlist/tests/common/outputs/mathematica/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/maxascii/JD_nomunge.retcode b/gnetlist/tests/common/outputs/maxascii/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/maxascii/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/maxascii/Makefile.am b/gnetlist/tests/common/outputs/maxascii/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/maxascii/Makefile.am
+++ b/gnetlist/tests/common/outputs/maxascii/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/osmond/JD_nomunge.retcode b/gnetlist/tests/common/outputs/osmond/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/osmond/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/osmond/Makefile.am b/gnetlist/tests/common/outputs/osmond/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/osmond/Makefile.am
+++ b/gnetlist/tests/common/outputs/osmond/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/pads/JD_nomunge-output.net b/gnetlist/tests/common/outputs/pads/JD_nomunge-output.net
index c4fc30c..f3a5213 100644
--- a/gnetlist/tests/common/outputs/pads/JD_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/pads/JD_nomunge-output.net
@@ -1,30 +1,30 @@
-!PADS-POWERPCB-V3.0-MILS!
-
-*PART*
-V1 none
-CM unknown
-A1 unknown
-RT unknown
-M1 unknown
-X1 unknown
-RLP unknown
-VDD none
-RLM unknown
-CP unknown
-RB unknown
-
-*NET*
-*SIGNAL* VDD1
- RLP.2 M1.B M1.S VDD.1 X1.6
-*SIGNAL* GND
- CM.2 CP.2 RLM.2 VDD.2 V1.2 RB.1 X1.7 X1.2
-*SIGNAL* LVH
- RB.2 M1.D M1.G X1.3
-*SIGNAL* I
- V1.1 X1.1
-*SIGNAL* P
- CP.1 RT.1 RLP.1 X1.5
-*SIGNAL* M
- CM.1 RLM.1 RT.2 X1.4
-
-*END*
+!PADS-POWERPCB-V3.0-MILS!
+
+*PART*
+V1 none
+CM unknown
+A1 unknown
+RT unknown
+M1 unknown
+X1 unknown
+RLP unknown
+VDD none
+RLM unknown
+CP unknown
+RB unknown
+
+*NET*
+*SIGNAL* VDD1
+ RLP.2 M1.B M1.S VDD.1 X1.6
+*SIGNAL* GND
+ CM.2 CP.2 RLM.2 VDD.2 V1.2 RB.1 X1.7 X1.2
+*SIGNAL* LVH
+ RB.2 M1.D M1.G X1.3
+*SIGNAL* I
+ V1.1 X1.1
+*SIGNAL* P
+ CP.1 RT.1 RLP.1 X1.5
+*SIGNAL* M
+ CM.1 RLM.1 RT.2 X1.4
+
+*END*
diff --git a/gnetlist/tests/common/outputs/pads/JD_nomunge.retcode b/gnetlist/tests/common/outputs/pads/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/pads/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/pads/Makefile.am b/gnetlist/tests/common/outputs/pads/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/pads/Makefile.am
+++ b/gnetlist/tests/common/outputs/pads/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/partslist1/JD_nomunge.retcode b/gnetlist/tests/common/outputs/partslist1/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/partslist1/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/partslist1/Makefile.am b/gnetlist/tests/common/outputs/partslist1/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/partslist1/Makefile.am
+++ b/gnetlist/tests/common/outputs/partslist1/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/partslist2/JD_nomunge.retcode b/gnetlist/tests/common/outputs/partslist2/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/partslist2/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/partslist2/Makefile.am b/gnetlist/tests/common/outputs/partslist2/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/partslist2/Makefile.am
+++ b/gnetlist/tests/common/outputs/partslist2/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/partslist3/JD_nomunge.retcode b/gnetlist/tests/common/outputs/partslist3/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/partslist3/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/partslist3/Makefile.am b/gnetlist/tests/common/outputs/partslist3/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/partslist3/Makefile.am
+++ b/gnetlist/tests/common/outputs/partslist3/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/pcbpins/JD_nomunge.retcode b/gnetlist/tests/common/outputs/pcbpins/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/pcbpins/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/pcbpins/Makefile.am b/gnetlist/tests/common/outputs/pcbpins/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/pcbpins/Makefile.am
+++ b/gnetlist/tests/common/outputs/pcbpins/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/protelII/JD_nomunge.retcode b/gnetlist/tests/common/outputs/protelII/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/protelII/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/protelII/Makefile.am b/gnetlist/tests/common/outputs/protelII/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/protelII/Makefile.am
+++ b/gnetlist/tests/common/outputs/protelII/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/redac/JD_nomunge.retcode b/gnetlist/tests/common/outputs/redac/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/redac/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/redac/Makefile.am b/gnetlist/tests/common/outputs/redac/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/redac/Makefile.am
+++ b/gnetlist/tests/common/outputs/redac/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/spice-sdb/JD_nomunge-output.net b/gnetlist/tests/common/outputs/spice-sdb/JD_nomunge-output.net
index e1bb285..cfaab32 100644
--- a/gnetlist/tests/common/outputs/spice-sdb/JD_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/spice-sdb/JD_nomunge-output.net
@@ -1,4 +1,4 @@
-* ../../../src/gnetlist -g spice-sdb LVDfoo.sch
+* ../../../src/gnetlist -g spice-sdb -n LVDfoo.sch
*********************************************************
* Spice file generated by gnetlist *
* spice-sdb version 4.28.2007 by SDB -- *
@@ -15,7 +15,7 @@ V1 i 0 pulse 3.3 0 1u 10p 10p 1.25u 2.5u
Cm m 0 20p
Rt p m 1k
M1 LVH LVH Vdd1 Vdd1 pch l=3u w=3u m=36
-UX1 i 0 LVH m p Vdd1 0 unknown_LVD
+X1 i 0 LVH m p Vdd1 0 unknown_LVD
Rlp p Vdd1 1meg
Vdd Vdd1 0 DC 3.3V
Rlm m 0 500k
diff --git a/gnetlist/tests/common/outputs/spice-sdb/JD_nomunge.retcode b/gnetlist/tests/common/outputs/spice-sdb/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/spice-sdb/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/spice-sdb/Makefile.am b/gnetlist/tests/common/outputs/spice-sdb/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/spice-sdb/Makefile.am
+++ b/gnetlist/tests/common/outputs/spice-sdb/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/spice/JD_nomunge.retcode b/gnetlist/tests/common/outputs/spice/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/spice/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/spice/Makefile.am b/gnetlist/tests/common/outputs/spice/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/spice/Makefile.am
+++ b/gnetlist/tests/common/outputs/spice/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/switcap/JD_nomunge.retcode b/gnetlist/tests/common/outputs/switcap/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/switcap/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/switcap/Makefile.am b/gnetlist/tests/common/outputs/switcap/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/switcap/Makefile.am
+++ b/gnetlist/tests/common/outputs/switcap/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/systemc/JD_nomunge-output.net b/gnetlist/tests/common/outputs/systemc/JD_nomunge-output.net
new file mode 100644
index 0000000..8c3783a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/systemc/JD_nomunge-output.net
@@ -0,0 +1,101 @@
+/* structural SystemC generated by gnetlist */
+/* WARNING: This is a generated file, edits */
+/* made here will be lost next time */
+/* you run gnetlist! */
+/* Id ........gnet-systemc.scm (04/09/2003) */
+/* Source...../home/geda/gnet-systemc.scm */
+/* Revision...0.3 (23/09/2003) */
+/* Author.....Jaume Masip */
+
+#include "systemc.h"
+#include "vpulse.h"
+#include "CAPACITOR.h"
+#include "model.h"
+#include "RESISTOR.h"
+#include "PMOS_TRANSISTOR.h"
+#include "LVD.h"
+#include "RESISTOR.h"
+#include "VOLTAGE_SOURCE.h"
+#include "RESISTOR.h"
+#include "CAPACITOR.h"
+#include "RESISTOR.h"
+
+SC_MODULE (not found)
+{
+
+/* Port directions begin here */
+
+/* Wires from the design */
+sc_signal<0> Vdd1;
+sc_signal<0> GND;
+sc_signal<0> LVH;
+sc_signal<0> i;
+sc_signal<0> p;
+sc_signal<0> m;
+
+
+/* Package instantiations */
+vpulse V1;
+CAPACITOR Cm;
+model A1;
+RESISTOR Rt;
+PMOS_TRANSISTOR M1;
+LVD X1;
+RESISTOR Rlp;
+VOLTAGE_SOURCE Vdd;
+RESISTOR Rlm;
+CAPACITOR Cp;
+RESISTOR Rb;
+
+SC_CTOR(not found):
+ V1("V1"),
+ Cm("Cm"),
+ A1("A1"),
+ Rt("Rt"),
+ M1("M1"),
+ X1("X1"),
+ Rlp("Rlp"),
+ Vdd("Vdd"),
+ Rlm("Rlm"),
+ Cp("Cp"),
+ Rb("Rb")
+ {
+ V1.1(i);
+ V1.2(GND);
+
+ Cm.1(m);
+ Cm.2(GND);
+
+ Rt.2(m);
+ Rt.1(p);
+
+ M1.S(Vdd1);
+ M1.B(Vdd1);
+ M1.D(LVH);
+ M1.G(LVH);
+
+ X1.4(m);
+ X1.5(p);
+ X1.1(i);
+ X1.3(LVH);
+ X1.2(GND);
+ X1.6(Vdd1);
+ X1.7(GND);
+
+ Rlp.2(Vdd1);
+ Rlp.1(p);
+
+ Vdd.1(Vdd1);
+ Vdd.2(GND);
+
+ Rlm.2(GND);
+ Rlm.1(m);
+
+ Cp.1(p);
+ Cp.2(GND);
+
+ Rb.2(LVH);
+ Rb.1(GND);
+ }
+};
+
diff --git a/gnetlist/tests/common/outputs/systemc/JD_nomunge.retcode b/gnetlist/tests/common/outputs/systemc/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/systemc/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/systemc/Makefile.am b/gnetlist/tests/common/outputs/systemc/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/systemc/Makefile.am
+++ b/gnetlist/tests/common/outputs/systemc/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/tango/JD_nomunge.retcode b/gnetlist/tests/common/outputs/tango/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/tango/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/tango/Makefile.am b/gnetlist/tests/common/outputs/tango/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/tango/Makefile.am
+++ b/gnetlist/tests/common/outputs/tango/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/vams/JD_nomunge.retcode b/gnetlist/tests/common/outputs/vams/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/vams/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/vams/Makefile.am b/gnetlist/tests/common/outputs/vams/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/vams/Makefile.am
+++ b/gnetlist/tests/common/outputs/vams/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/verilog/JD_nomunge.retcode b/gnetlist/tests/common/outputs/verilog/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/verilog/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/verilog/Makefile.am b/gnetlist/tests/common/outputs/verilog/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/verilog/Makefile.am
+++ b/gnetlist/tests/common/outputs/verilog/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/vhdl/JD_nomunge.retcode b/gnetlist/tests/common/outputs/vhdl/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/vhdl/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/vhdl/Makefile.am b/gnetlist/tests/common/outputs/vhdl/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/vhdl/Makefile.am
+++ b/gnetlist/tests/common/outputs/vhdl/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/outputs/vipec/JD_nomunge.retcode b/gnetlist/tests/common/outputs/vipec/JD_nomunge.retcode
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/gnetlist/tests/common/outputs/vipec/JD_nomunge.retcode
@@ -0,0 +1 @@
+0
diff --git a/gnetlist/tests/common/outputs/vipec/Makefile.am b/gnetlist/tests/common/outputs/vipec/Makefile.am
index bf3dd39..fd2bedc 100644
--- a/gnetlist/tests/common/outputs/vipec/Makefile.am
+++ b/gnetlist/tests/common/outputs/vipec/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST= \
JD_Include-output.net \
JD_Include.retcode \
JD_nomunge-output.net \
+ JD_nomunge.retcode \
JD-output.net \
JD.retcode \
JD_Sort_nomunge-output.net \
diff --git a/gnetlist/tests/common/tests.list b/gnetlist/tests/common/tests.list
index 8607735..3ace5b7 100644
--- a/gnetlist/tests/common/tests.list
+++ b/gnetlist/tests/common/tests.list
@@ -28,7 +28,7 @@ JD | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | |
JD_Include | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -I
JD_Sort | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -s
# Now test non-munged version.
-JD_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | | -n
+JD_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -n
JD_Include_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -I -n
JD_Sort_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -s -n
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs