[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: branch: master updated (1.4.0-20080127-16-gb62e017)



The branch, master has been updated
       via  b62e01773459c0c5df66482aa71c623191242bfd (commit)
       via  291502025248298b4d42cfbd80ff605dc62c3f92 (commit)
      from  d68fe1307f4f98aa51844bbf378d5d0a9467b8b2 (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/scheme/gnet-pads.scm   |   16 ++++----
 gnetlist/tests/powersupply.pads |   82 +++++++++++++++++++-------------------
 gnetlist/tests/singlenet.pads   |   32 ++++++++--------
 3 files changed, 65 insertions(+), 65 deletions(-)


=================
 Commit Messages
=================

commit 291502025248298b4d42cfbd80ff605dc62c3f92
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date:   Wed Feb 27 12:36:12 2008 +0000

    Make the pads netlist backend use CR/LF instead of just LF.
    
    Based on a discussion on the gEDA mailing lists it seems that PADS
    (which runs only on windows) needs DOS style netlists and not unix
    style netlists.  So rather than forcing a unix2dos step in beween
    netlisting and using the result, go ahead and teach the pads netlist
    backend to directly write out a DOS style netlist.  Update the
    testsuite accordingly.

:100644 100644 5ba537f... 12a429c... M	gnetlist/scheme/gnet-pads.scm
:100644 100644 5200ae8... 3aa5cd9... M	gnetlist/tests/powersupply.pads
:100644 100644 47d3453... d12c1b9... M	gnetlist/tests/singlenet.pads

=========
 Changes
=========

commit 291502025248298b4d42cfbd80ff605dc62c3f92
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date:   Wed Feb 27 12:36:12 2008 +0000

    Make the pads netlist backend use CR/LF instead of just LF.
    
    Based on a discussion on the gEDA mailing lists it seems that PADS
    (which runs only on windows) needs DOS style netlists and not unix
    style netlists.  So rather than forcing a unix2dos step in beween
    netlisting and using the result, go ahead and teach the pads netlist
    backend to directly write out a DOS style netlist.  Update the
    testsuite accordingly.

diff --git a/gnetlist/scheme/gnet-pads.scm b/gnetlist/scheme/gnet-pads.scm
index 5ba537f..12a429c 100644
--- a/gnetlist/scheme/gnet-pads.scm
+++ b/gnetlist/scheme/gnet-pads.scm
@@ -68,7 +68,7 @@
 
 	       (write-char #\tab port) 
                (display (gnetlist:get-package-attribute package "footprint") port)
-               (newline port))
+               (display "\r\n" port))
             (pads:components port (cdr packages))))))
 
 (define (pads:display-connections nets)
@@ -78,7 +78,7 @@
               (map (lambda (net)
                      (string-append " " (gnetlist:alias-refdes (car net)) "." (car (cdr net))))
                    nets))
-    (string-append k "\n")))
+    (string-append k "\r\n")))
 
 
 ; This function is replaced with the above one. Due to non existent
@@ -88,7 +88,7 @@
 ;  (if (not (null? nets))
 ;      (string-append " " (car (car nets)) "." (car (cdr (car nets)))
 ;       (pads:display-connections (cdr nets)))
-;      "\n"))
+;      "\r\n"))
 
 
 
@@ -98,7 +98,7 @@
          (let ((netname (car netnames)))
 	    (display "*SIGNAL* " port)
 	    (display (gnetlist:alias-net netname) port)
-	    (newline port)
+	    (display "\r\n" port)
             (display (gnetlist:wrap 
 		      (pads:display-connections 
 		       (gnetlist:get-all-connections netname)) 
@@ -117,17 +117,17 @@
 	(gnetlist:build-refdes-aliases pads:map-refdes packages)
 
 	;; print out the header
-	(display "!PADS-POWERPCB-V3.0-MILS!\n" port)
-	(display "\n*PART*\n" port)
+	(display "!PADS-POWERPCB-V3.0-MILS!\r\n" port)
+	(display "\r\n*PART*\r\n" port)
 	
 	;; print out the parts
 	(pads:components port packages)
 	
 	;; print out the net information
-	(display "\n*NET*\n" port)
+	(display "\r\n*NET*\r\n" port)
 	(pads:write-net port (gnetlist:get-all-unique-nets "dummy"))
 	
 	;; print out the footer
-	(display "\n*END*\n" port)
+	(display "\r\n*END*\r\n" port)
 	(close-output-port port))))
 
diff --git a/gnetlist/tests/powersupply.pads b/gnetlist/tests/powersupply.pads
index 5200ae8..3aa5cd9 100644
--- a/gnetlist/tests/powersupply.pads
+++ b/gnetlist/tests/powersupply.pads
@@ -1,41 +1,41 @@
-!PADS-POWERPCB-V3.0-MILS!
-
-*PART*
-F1	unknown
-R2	unknown
-CONN1	unknown
-C4	unknown
-R1	unknown
-C3	unknown
-C2	unknown
-S1	unknown
-C1	unknown
-T1	unknown
-U2	unknown
-U1	unknown
-
-*NET*
-*SIGNAL* TEN
- U2.1 R1.2 C3.1 R2.1
-*SIGNAL* ELEVEN
- U2.2 C4.1 R2.2
-*SIGNAL* GND
- CONN1.3
-*SIGNAL* ONE
- S1.1 CONN1.1
-*SIGNAL* FIVE
- CONN1.2 T1.2
-*SIGNAL* THREE
- T1.1 F1.2
-*SIGNAL* TWO
- S1.2 F1.1
-*SIGNAL* SIX
- T1.3 U1.4
-*SIGNAL* SEVEN
- T1.4 U1.3
-*SIGNAL* NINE
- C4.2 C3.2 R1.3 R1.1 C2.2 C1.2 U1.2
-*SIGNAL* EIGHT
- U2.3 C2.1 C1.1 U1.1
-
-*END*
+!PADS-POWERPCB-V3.0-MILS!
+
+*PART*
+F1	unknown
+R2	unknown
+CONN1	unknown
+C4	unknown
+R1	unknown
+C3	unknown
+C2	unknown
+S1	unknown
+C1	unknown
+T1	unknown
+U2	unknown
+U1	unknown
+
+*NET*
+*SIGNAL* TEN
+ U2.1 R1.2 C3.1 R2.1
+*SIGNAL* ELEVEN
+ U2.2 C4.1 R2.2
+*SIGNAL* GND
+ CONN1.3
+*SIGNAL* ONE
+ S1.1 CONN1.1
+*SIGNAL* FIVE
+ CONN1.2 T1.2
+*SIGNAL* THREE
+ T1.1 F1.2
+*SIGNAL* TWO
+ S1.2 F1.1
+*SIGNAL* SIX
+ T1.3 U1.4
+*SIGNAL* SEVEN
+ T1.4 U1.3
+*SIGNAL* NINE
+ C4.2 C3.2 R1.3 R1.1 C2.2 C1.2 U1.2
+*SIGNAL* EIGHT
+ U2.3 C2.1 C1.1 U1.1
+
+*END*
diff --git a/gnetlist/tests/singlenet.pads b/gnetlist/tests/singlenet.pads
index 47d3453..d12c1b9 100644
--- a/gnetlist/tests/singlenet.pads
+++ b/gnetlist/tests/singlenet.pads
@@ -1,16 +1,16 @@
-!PADS-POWERPCB-V3.0-MILS!
-
-*PART*
-U100	DIP14
-
-*NET*
-*SIGNAL* SINGLE_NET2
- U100.1 U100.3
-*SIGNAL* GND
- U100.7
-*SIGNAL* VCC
- U100.14
-*SIGNAL* SINGLE_NET
- U100.4 U100.5 U100.10 U100.8 U100.9 U100.6
-
-*END*
+!PADS-POWERPCB-V3.0-MILS!
+
+*PART*
+U100	DIP14
+
+*NET*
+*SIGNAL* SINGLE_NET2
+ U100.1 U100.3
+*SIGNAL* GND
+ U100.7
+*SIGNAL* VCC
+ U100.14
+*SIGNAL* SINGLE_NET
+ U100.4 U100.5 U100.10 U100.8 U100.9 U100.6
+
+*END*




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs