gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-135-g73a73cd)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  73a73cd0cb54d0f9430075aa00359b7840bd8d2c (commit)
       via  e36585def8789540f25464edecbf119706882958 (commit)
      from  9a54c6de1fa6af39ec97b8bb0cd1a251094ad3f1 (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-bom2.scm |   14 +++++++++-----
 gnetlist/src/s_traverse.c     |    6 +++++-
 2 files changed, 14 insertions(+), 6 deletions(-)


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

commit 73a73cd0cb54d0f9430075aa00359b7840bd8d2c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun Aug 17 02:19:49 2008 +0100

    Add qty column to bom2 gnetlist backend
    
    It is convenient for board-assembly houses who want to see a qty.
    against each line-item they have to procure.

:100644 100644 e5a946b... 37b704a... M	gnetlist/scheme/gnet-bom2.scm

commit e36585def8789540f25464edecbf119706882958
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun Aug 17 01:59:29 2008 +0100

    gnetlist: Don't drop all hierarchy prefix for children without refdes=...
    
    If a hierarchy block is missing its refdes=... attribute, insert it
    without any change of hierarchy prefix. The block's contents keep the
    same hierarchy level as the instantiating schematic. Previously the block
    was inserted at the root level, with no hierarchical name mangling.
    
    This may be useful in some cases if you want to suspend hiearchy mangling
    for certain portions of a hierarchical design. (NB: You would then be
    responsible for avoiding refdes name clashes). A similar effect can be be
    obtained on a design wide basis by setting the options:
    (hierarchy-*-mangle "disabled") in a gnetlistrc file.

:100644 100644 86917fc... ad6e4be... M	gnetlist/src/s_traverse.c

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

commit 73a73cd0cb54d0f9430075aa00359b7840bd8d2c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun Aug 17 02:19:49 2008 +0100

    Add qty column to bom2 gnetlist backend
    
    It is convenient for board-assembly houses who want to see a qty.
    against each line-item they have to procure.

diff --git a/gnetlist/scheme/gnet-bom2.scm b/gnetlist/scheme/gnet-bom2.scm
index e5a946b..37b704a 100644
--- a/gnetlist/scheme/gnet-bom2.scm
+++ b/gnetlist/scheme/gnet-bom2.scm
@@ -38,25 +38,29 @@
 		      (current-output-port)
 		      (open-output-file output-filename)))
 	  (attriblist (bom2:parseconfig (open-input-file "attribs"))))
-      (bom2:printlist (cons 'refdes attriblist) port #\:)
+      (bom2:printlist (append (cons 'refdes attriblist) (list "qty")) port #\:)
       (newline port)
-      (bom2:printbom port (bom2:components packages attriblist))
+      (bom2:printbom port (bom2:components packages attriblist) 0)
       (close-output-port port))))
 
 (define bom2:printbom
-  (lambda (port bomlist)
+  (lambda (port bomlist count)
     (if (not (null? bomlist))
       (if (not (null? (caar bomlist)))
         (begin
           (display (caaar bomlist) port)
           (if (not (null? (cdaar bomlist)))
             (write-char #\, port))
-          (bom2:printbom port (cons (cons (cdaar bomlist)(cdar bomlist))(cdr bomlist))))
+          (bom2:printbom port (cons (cons (cdaar bomlist)(cdar bomlist))(cdr bomlist)) (+ count 1))
+        )
         (begin
           (display #\: port)
           (bom2:printlist (cdar bomlist) port #\:)
+          (display #\: port)
+          (display count port)
           (newline port)
-          (bom2:printbom port (cdr bomlist)))))))
+          (bom2:printbom port (cdr bomlist) 0)
+        )))))
 
 (define bom2:printlist
   (lambda (ls port delimiter)

commit e36585def8789540f25464edecbf119706882958
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun Aug 17 01:59:29 2008 +0100

    gnetlist: Don't drop all hierarchy prefix for children without refdes=...
    
    If a hierarchy block is missing its refdes=... attribute, insert it
    without any change of hierarchy prefix. The block's contents keep the
    same hierarchy level as the instantiating schematic. Previously the block
    was inserted at the root level, with no hierarchical name mangling.
    
    This may be useful in some cases if you want to suspend hiearchy mangling
    for certain portions of a hierarchical design. (NB: You would then be
    responsible for avoiding refdes name clashes). A similar effect can be be
    obtained on a design wide basis by setting the options:
    (hierarchy-*-mangle "disabled") in a gnetlistrc file.

diff --git a/gnetlist/src/s_traverse.c b/gnetlist/src/s_traverse.c
index 86917fc..ad6e4be 100644
--- a/gnetlist/src/s_traverse.c
+++ b/gnetlist/src/s_traverse.c
@@ -153,7 +153,11 @@ s_traverse_sheet(TOPLEVEL * pr_current, OBJECT * start,
           s_hierarchy_create_uref(pr_current, temp_uref, hierarchy_tag);
         g_free(temp_uref);
       } else {
-        netlist->component_uref = NULL;
+        if (hierarchy_tag) {
+          netlist->component_uref = g_strdup (hierarchy_tag);
+        } else {
+          netlist->component_uref = NULL;
+        }
       }
       
       if (hierarchy_tag) {




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