Send commitlog mailing list submissions to
        commitlog@lists.openmoko.org

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
        commitlog-requ...@lists.openmoko.org

You can reach the person managing the list at
        commitlog-ow...@lists.openmoko.org

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:

   1. r5828 - in trunk/gta02-core: bom bom/fic web
      (wer...@docs.openmoko.org)
   2. r5830 - in trunk/gta02-core/bom: . fic (wer...@docs.openmoko.org)
   3. r5832 - trunk/eda/boom (wer...@docs.openmoko.org)
   4. r5833 - trunk/eda/boom (wer...@docs.openmoko.org)
   5. r5835 - in trunk: eda/boom gta02-core/bom
      (wer...@docs.openmoko.org)
   6. r5836 - in trunk: eda/boom gta02-core/bom
      (wer...@docs.openmoko.org)
--- Begin Message ---
Author: werner
Date: 2010-02-07 15:56:06 +0100 (Sun, 07 Feb 2010)
New Revision: 5828

Modified:
   trunk/gta02-core/bom/Makefile
   trunk/gta02-core/bom/fic/Makefile
   trunk/gta02-core/web/gta02-core.html
Log:
Added back-annotated schematics to the "quick access" Web page and cleaned
up the build process further.

- web/gta02-core.html: added back-annotated schematics
- bom/Makefile: forgot the --shrink option for all-sheets. No surprise they 
  looked quite crazy.
- bom/Makefile: added "upload" target
- bom/fic/Makeflile: added missing.equ to "all" target, so we can build 
  everything used by bom/ with a single "make"
- bom/Makefile: fic/* are no longer phony, so we don't have to rebuild 
  everything for every single little target



Modified: trunk/gta02-core/bom/Makefile
===================================================================
--- trunk/gta02-core/bom/Makefile       2010-02-07 14:33:40 UTC (rev 5827)
+++ trunk/gta02-core/bom/Makefile       2010-02-07 14:56:06 UTC (rev 5828)
@@ -10,8 +10,6 @@
 SCH=audio bt cpu-power cpu gps io lcm memory modem pmu sd-sim usb wlan
 
 .PHONY:                all spotless show-dup show-missing show-dk
-# mark them as phony since we have incomplete dependencies in this Makefile
-.PHONY:                fic/fic.equ fic/fic.inv fic/missing.equ
 .PHONY:                ann sch gen generate gv xpdf upload
 
 all:           gta02-core.ord
@@ -49,7 +47,9 @@
 spotless:
                $(MAKE) -C fic spotless
                rm -f gta02-core.par gta02-core.ord darfon.chr ralec.chr
-               rm -f gta02-core-bom.pro gta02-core-bom.sch $(SCH:%=%-bom.sch)
+               rm -f gta02-core-bom.pro gta02-core-bom.sch
+               rm -f gta02-core-bom-all.ps.gz gta02-core-bom-all.pdf
+               rm -f $(SCH:%=%-bom.sch) $(SCH:%=%-bom.ps)
 
 show-dup:      gta02-core.par
                $(BOOM) ./pardup.pl gta02-core.par
@@ -90,12 +90,16 @@
 
 gen generate:  gta02-core-bom.pro gta02-core-bom.sch $(SCH:%=%-bom.sch)
                eeschema --plot `pwd`/gta02-core-bom.sch
-               ../scripts/all-sheets gta02-core-bom
+               ../scripts/all-sheets --shrink gta02-core-bom
                gzip -f -9 gta02-core-bom-all.ps
-               ../scripts/all-sheets --pdf gta02-core-bom
+               ../scripts/all-sheets --shrink --pdf gta02-core-bom
 
 gv:            gta02-core-bom-all.ps.gz
                gv gta02-core-bom-all.ps.gz
 
 xpdf:          gta02-core-bom-all.pdf
                xpdf gta02-core-bom-all.pdf
+
+upload:                generate
+               $(COPY) gta02-core-bom-all.ps.gz gta02-core-bom-all.pdf \
+                 $(UPLOAD)

Modified: trunk/gta02-core/bom/fic/Makefile
===================================================================
--- trunk/gta02-core/bom/fic/Makefile   2010-02-07 14:33:40 UTC (rev 5827)
+++ trunk/gta02-core/bom/fic/Makefile   2010-02-07 14:56:06 UTC (rev 5828)
@@ -4,7 +4,7 @@
 
 .PHONY:                all spotless
 
-all:           fic.equ fic.inv fic.dsc present.inv
+all:           fic.equ fic.inv fic.dsc present.inv missing.equ
 
 fic.equ:       fic2vendor $(INV)
                perl fic2vendor $(INV) >$@ || { rm -f $@; exit 1; }

Modified: trunk/gta02-core/web/gta02-core.html
===================================================================
--- trunk/gta02-core/web/gta02-core.html        2010-02-07 14:33:40 UTC (rev 
5827)
+++ trunk/gta02-core/web/gta02-core.html        2010-02-07 14:56:06 UTC (rev 
5828)
@@ -16,5 +16,9 @@
 Modules (footprints):
 <A href="gta02-core/gta02-core-modules.pdf">PDF</A>,
 <A href="gta02-core/gta02-core-modules.ps.gz">compressed Postscript</A>.
+<P>
+Schematics with part selection back-annotation:
+<A href="gta02-core/gta02-core-bom-all.pdf">PDF</A>,
+<A href="gta02-core/gta02-core-bom-all.ps.gz">compressed Postscript</A>.
 </BODY>
 </HTML>




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2010-02-07 17:07:09 +0100 (Sun, 07 Feb 2010)
New Revision: 5830

Modified:
   trunk/gta02-core/bom/Makefile
   trunk/gta02-core/bom/fic/Makefile
   trunk/gta02-core/bom/fic/fic2inv
Log:
FIC's inventory can be interpreted optimistically or pessimistically.
Depending on which viewpoint we choose, we can now "make pessimist" or
"make optimist".

- bom/Makefile (show-dk): print the total cost at the end
- bom/fic/fic2inv: added option --optimist to consider the real stock to be 
  "Demand Q'ty" plus "Usable Q'ty"
- bom/Makefile: targets "optimist" and "pessimist" to obtain optimistic and
  pessimistic interpretation of FIC's inventory



Modified: trunk/gta02-core/bom/Makefile
===================================================================
--- trunk/gta02-core/bom/Makefile       2010-02-07 16:02:00 UTC (rev 5829)
+++ trunk/gta02-core/bom/Makefile       2010-02-07 16:07:09 UTC (rev 5830)
@@ -9,11 +9,21 @@
 CHR=darfon.chr ralec.chr avx.chr acx.chr misc.chr
 SCH=audio bt cpu-power cpu gps io lcm memory modem pmu sd-sim usb wlan
 
-.PHONY:                all spotless show-dup show-missing show-dk
+.PHONY:                all optimist pessimist spotless show-dup show-missing 
show-dk
 .PHONY:                ann sch gen generate gv xpdf upload
 
 all:           gta02-core.ord
 
+optimist:
+               $(MAKE) spotless
+               $(MAKE) -C fic INTERPRETATION=--optimistic
+               $(MAKE) all
+
+pessimist:
+               $(MAKE) spotless
+               $(MAKE) -C fic
+               $(MAKE) all
+
 gta02-core.ord:        gta02-core.par $(INV) $(EQU)
                $(BOOM) part2order $(KITS) \
                  $(INV) $(EQU) gta02-core.par >$@ || \
@@ -62,7 +72,8 @@
 show-dk:
                (echo '#ORD'; grep DIGI-KEY gta02-core.ord ; ) | \
                  $(BOOM) prettyord - digi-key.dsc | \
-                 sed 's/^...  //'
+                 sed 's/^...  //' | \
+                 awk '{ s += $$(NF); print; } END { print "USD", s }'
 
 #ANN = pmu
 ANN = audio

Modified: trunk/gta02-core/bom/fic/Makefile
===================================================================
--- trunk/gta02-core/bom/fic/Makefile   2010-02-07 16:02:00 UTC (rev 5829)
+++ trunk/gta02-core/bom/fic/Makefile   2010-02-07 16:07:09 UTC (rev 5830)
@@ -10,7 +10,8 @@
                perl fic2vendor $(INV) >$@ || { rm -f $@; exit 1; }
 
 fic.inv:       fic2inv $(INV)
-               perl fic2inv $(INV) >$@ || { rm -f $@; exit 1; }
+               perl fic2inv $(INTERPRETATION) $(INV) >$@ || \
+                 { rm -f $@; exit 1; }
 
 fic.dsc:       fic2dsc $(INV)
                perl fic2dsc $(INV) >$@ || { rm -f $@; exit 1; }

Modified: trunk/gta02-core/bom/fic/fic2inv
===================================================================
--- trunk/gta02-core/bom/fic/fic2inv    2010-02-07 16:02:00 UTC (rev 5829)
+++ trunk/gta02-core/bom/fic/fic2inv    2010-02-07 16:07:09 UTC (rev 5830)
@@ -1,8 +1,37 @@
 #!/usr/bin/perl
 
+# pessimistic: assume the "Q'ty in stock" column is right
+# optimistic: assume the real stock is the sum of "Usable Q'ty" and "Demand
+#             Q'ty"
+
+sub usage
+{
+    print STDERR "$0 [--optimistic|--pessimistic]\n";
+    exit(1);
+}
+
+
+if ($ARGV[0] eq "--optimistic") {
+    $opt = 1;
+    shift @ARGV;
+}
+if ($ARGV[0] eq "--pessimistic") {
+    $opt = 0;
+    shift @ARGV;
+}
+&usage if $ARGV[0] =~ /^-/;
+
 print "#INV\n";
 while (<>) {
     chop;
-    next unless /^\d*,"(\S+)\s*",.*,"(\d+)\s*"(,-?\d+)?$/;
-    print "FIC $1 $2 USD 1 0\n";
+    if ($opt) {
+       next unless /^\d*,"(\S+)\s*",.*,"(\d+)\s*","(\d+)\s*",(-?\d+)?$/;
+       $q = $2+$4;
+       die "$1: $2+$4 < $3" if $q < $3;
+       die "$1: $2+$4 < 0" if $q < 0;
+       print "FIC $1 $q USD 1 0\n";
+    } else {
+       next unless /^\d*,"(\S+)\s*",.*,"(\d+)\s*",(-?\d+)?$/;
+       print "FIC $1 $2 USD 1 0\n";
+    }
 }




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2010-02-07 17:27:33 +0100 (Sun, 07 Feb 2010)
New Revision: 5832

Modified:
   trunk/eda/boom/prettyord
Log:
Make "make show-dk" look good again.

- eda/boom/prettyord: ignore the width of the last non-empty title field, so
  that we get a more compact table



Modified: trunk/eda/boom/prettyord
===================================================================
--- trunk/eda/boom/prettyord    2010-02-07 16:09:52 UTC (rev 5831)
+++ trunk/eda/boom/prettyord    2010-02-07 16:27:33 UTC (rev 5832)
@@ -32,9 +32,20 @@
 
 for (@out) {
     push(@max, 0);
+    if (length $_->[0]) {
+       $max[$last_pos] = $last_len if defined $last_pos;
+       $last_pos = $#max;
+       $last_len = length $_->[0];
+    }
+}
+$i = 0;
+for (@out) {
+    $first = 1;
     for (@{ $_ }) {
-       $max[$#max] = length $_ if length $_ > $max[$#max];
+       next if $first-- > 0;
+       $max[$i] = length $_ if length $_ > $max[$i];
     }
+    $i++;
 }
 
 for ($i = 0; $i <= $#{ $out[0] }; $i++) {




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2010-02-07 17:31:51 +0100 (Sun, 07 Feb 2010)
New Revision: 5833

Modified:
   trunk/eda/boom/prettyord
Log:
The title line still wrapped, for no good reason.

- eda/boom/prettyord: strip trailing spaces from output



Modified: trunk/eda/boom/prettyord
===================================================================
--- trunk/eda/boom/prettyord    2010-02-07 16:27:33 UTC (rev 5832)
+++ trunk/eda/boom/prettyord    2010-02-07 16:31:51 UTC (rev 5833)
@@ -49,12 +49,14 @@
 }
 
 for ($i = 0; $i <= $#{ $out[0] }; $i++) {
+    $l = "";
     for ($j = 0; $j != 6; $j++) {
        my $s = $out[$j][$i];;
-       print $s if $j == 2 || $j == 3 || $j == 4;
-       print " " x ($max[$j]-length $s);
-       print $s if $j == 0 || $j == 1 || $j == 5;
-       print "  " unless $j == 5;
+       $l .= $s if $j == 2 || $j == 3 || $j == 4;
+       $l .= " " x ($max[$j]-length $s);
+       $l .= $s if $j == 0 || $j == 1 || $j == 5;
+       $l .= "  " unless $j == 5;
     }
-    print "\n";
+    $l =~ s/\s*$//;
+    print "$l\n";
 }




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2010-02-07 18:46:18 +0100 (Sun, 07 Feb 2010)
New Revision: 5835

Modified:
   trunk/eda/boom/annotate
   trunk/gta02-core/bom/Makefile
Log:
Annotations can now also use order data instead of or in addition to the parts 
list.

- eda/boom/annotate: if .ord data is available, use it for descriptions too
- bom/Makefile: annotations now use gta02-core.ord, not gta02-core.par
- bom/Makefile: annotations can be switched back to gta02-core.par by setting
  ANNOTATE=par
- bom/Makefile (spotless): didn't remove .ps files



Modified: trunk/eda/boom/annotate
===================================================================
--- trunk/eda/boom/annotate     2010-02-07 17:02:40 UTC (rev 5834)
+++ trunk/eda/boom/annotate     2010-02-07 17:46:18 UTC (rev 5835)
@@ -103,6 +103,45 @@
 }
 
 
+sub find_dsc
+{
+    local ($id) = @_;
+
+    for ($id, &eq($id)) {
+       return $dsc{$_} if defined $dsc{$_};
+    }
+    return ();
+}
+
+
+sub dsc_parts
+{
+    local ($ref) = @_;
+    my @p = @{ $parts{$ref} };
+    my @f = ();
+    while (@p) {
+       my @id = splice(@p, 0, 2);
+       my $id = "$id[0] $id[1]";
+       push(@f, &find_dsc($id));
+    }
+    return @f;
+}
+
+
+sub dsc_order
+{
+    local ($ref) = @_;
+    my @f = ();
+    for my $id (keys %order) {
+       my @p = @{ $order{$id} };
+       for (splice(@p, 3)) {
+           push(@f, &find_dsc($id)) if $_ eq $ref;
+       }
+    }
+    return @f;
+}
+
+
 #
 # pass 1: find the orientation of all parts
 #
@@ -150,16 +189,8 @@
     undef @f if /^\$Comp/;
     if (/^L \S+ (\S+)/) {
        $ref = $1;
-       my @p = @{ $parts{$ref} };
-       while (@p) {
-           my @id = splice(@p, 0, 2);
-           my $id = "$id[0] $id[1]";
-           for ($id, &eq($id)) {
-               next unless defined $dsc{$_};
-               push(@f, $dsc{$_});
-               last;
-           }
-       }
+       push(@f, &dsc_order($ref)) if %order;
+       push(@f, &dsc_parts($ref)) if %parts;
     }
     if (/^P (\d+) (\d+)/) {
        $x = $1;

Modified: trunk/gta02-core/bom/Makefile
===================================================================
--- trunk/gta02-core/bom/Makefile       2010-02-07 17:02:40 UTC (rev 5834)
+++ trunk/gta02-core/bom/Makefile       2010-02-07 17:46:18 UTC (rev 5835)
@@ -3,6 +3,8 @@
 
 BOOM=../../eda/boom/boom
 
+ANNOTATE=ord   # make ANNOTATE=par ... for the parts list
+
 KITS=20
 EQU=fic/fic.equ fic/missing.equ digi-key.equ
 INV=fic/fic.inv gta02-core.inv dummy.inv fic/missing.inv digi-key.inv
@@ -59,7 +61,7 @@
                rm -f gta02-core.par gta02-core.ord darfon.chr ralec.chr
                rm -f gta02-core-bom.pro gta02-core-bom.sch
                rm -f gta02-core-bom-all.ps.gz gta02-core-bom-all.pdf
-               rm -f $(SCH:%=%-bom.sch) $(SCH:%=%-bom.ps)
+               rm -f $(SCH:%=%-bom.sch) gta02-core-bom-*.ps
 
 show-dup:      gta02-core.par
                $(BOOM) ./pardup.pl gta02-core.par
@@ -82,10 +84,11 @@
                  $(EQU) >$(ANN)-bom.sch || { rm -f $(ANN)-bom.sch; exit 1; }
 
 $(SCH:%=%-bom.sch): \
-               $(SCH:%=../%.sch) fic/fic.dsc gta02-core.par $(EQU)
+               $(SCH:%=../%.sch) fic/fic.dsc gta02-core.$(ANNOTATE) $(EQU)
                for n in $(SCH); do \
-                   $(BOOM) annotate ../$$n.sch fic/fic.dsc gta02-core.par \
-                     $(EQU) >$$n-bom.sch || { rm -f $$n-bom.sch; exit 1; }; \
+                   $(BOOM) annotate ../$$n.sch fic/fic.dsc \
+                     gta02-core.$(ANNOTATE) $(EQU) >$$n-bom.sch \
+                     || { rm -f $$n-bom.sch; exit 1; }; \
                done
 
 gta02-core-bom.pro:    ../gta02-core.pro




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2010-02-08 04:47:47 +0100 (Mon, 08 Feb 2010)
New Revision: 5836

Modified:
   trunk/eda/boom/annotate
   trunk/eda/boom/misc.pl
   trunk/eda/boom/prettyord
   trunk/gta02-core/bom/Makefile
Log:
Follow "OldPn" references in descriptions.

- eda/boom/misc.pl: moved description lookup from "prettyord" and "annotate"
- eda/boom/misc.pl: added mechanism to translate pointers in descriptions back
  to component references within a lookup
- eda/boom/prettyord, eda/boom/annotate: new hackish option -s/from/to/ to add
  translations
- bom/Makefile: new target "show-fic" to show the list of items from FIC's
  inventory
- bom/Makefile: use -s for "show-fic" and annotation to handle "OldPn" records
- bom/Makefile: made regexps used to grep through the order list more robust



Modified: trunk/eda/boom/annotate
===================================================================
--- trunk/eda/boom/annotate     2010-02-07 17:46:18 UTC (rev 5835)
+++ trunk/eda/boom/annotate     2010-02-08 03:47:47 UTC (rev 5836)
@@ -4,9 +4,6 @@
 require "misc.pl";
 
 
-&parse;
-
-
 $H = 50;       # character height
 $W = $H*0.9;   # character width
 $L = $H+20;    # line skip
@@ -103,17 +100,6 @@
 }
 
 
-sub find_dsc
-{
-    local ($id) = @_;
-
-    for ($id, &eq($id)) {
-       return $dsc{$_} if defined $dsc{$_};
-    }
-    return ();
-}
-
-
 sub dsc_parts
 {
     local ($ref) = @_;
@@ -122,7 +108,8 @@
     while (@p) {
        my @id = splice(@p, 0, 2);
        my $id = "$id[0] $id[1]";
-       push(@f, &find_dsc($id));
+       my $dsc = &dsc_find($id);
+       push(@f, &dsc) if defined $dsc;
     }
     return @f;
 }
@@ -135,13 +122,29 @@
     for my $id (keys %order) {
        my @p = @{ $order{$id} };
        for (splice(@p, 3)) {
-           push(@f, &find_dsc($id)) if $_ eq $ref;
+           push(@f, &dsc_find($id)) if $_ eq $ref;
        }
     }
     return @f;
 }
 
 
+sub usage
+{
+    print STDERR "usage: $0 [-s/from/to/ ...] ...\n";
+    exit(1);
+}
+
+
+while ($ARGV[0] =~ /^-s/) {
+    &usage unless &dsc_xlat_arg($');
+    shift @ARGV;
+}
+&usage if $ARGV[0] =~ /^-./;
+
+&parse;
+
+
 #
 # pass 1: find the orientation of all parts
 #

Modified: trunk/eda/boom/misc.pl
===================================================================
--- trunk/eda/boom/misc.pl      2010-02-07 17:46:18 UTC (rev 5835)
+++ trunk/eda/boom/misc.pl      2010-02-08 03:47:47 UTC (rev 5836)
@@ -23,4 +23,57 @@
 }
 
 
+#
+# When looking for a description, we also consider equivalent parts.
+#
+# Furthermore, some descriptions may just be pointers to other descriptions.
+# Users can add regular expressions that are used to extract references from
+# a description, which are then looked up as well.
+#
+
+sub __dsc_lookup
+{
+    local ($id) = @_;
+
+    for ($id, &eq($id)) {
+        return $dsc{$_} if defined $dsc{$_};
+    }
+    return undef;
+}
+
+
+sub dsc_find
+{
+    my $id = $_[0];
+    LOOKUP: while (1) {
+       my $dsc = &__dsc_lookup($id);
+       return undef unless defined $dsc;
+       for (my $i = 0; $i <= $#xlat_from; $i++) {
+# @@@ this is UUUUHHHGLLEEEEE !!! Why can't I just expand $to[$i] ?
+           next
+             unless ($id = $dsc) =~ s/^.*$xlat_from[$i].*$/$xlat_to[$i] $1/;
+           next LOOKUP if defined &__dsc_lookup($id);
+       }
+       return $dsc;
+    }
+    return undef;
+}
+
+
+sub dsc_xlat
+{
+    local ($from, $to) = @_;
+    push(@xlat_from, $from);
+    push(@xlat_to, $to);
+}
+
+
+sub dsc_xlat_arg
+{
+    return undef unless $_[0] =~ /^(.)([^\1]*)\1([^\1]*)\1$/;
+    &dsc_xlat($2, $3);
+    return 1;
+}
+
+
 return 1;

Modified: trunk/eda/boom/prettyord
===================================================================
--- trunk/eda/boom/prettyord    2010-02-07 17:46:18 UTC (rev 5835)
+++ trunk/eda/boom/prettyord    2010-02-08 03:47:47 UTC (rev 5836)
@@ -3,6 +3,20 @@
 require "parser.pl";
 require "misc.pl";
 
+
+sub usage
+{
+    print STDERR "usage: $0 [-s/from/to/ ...] ...\n";
+    exit(1);
+}
+
+
+while ($ARGV[0] =~ /^-s/) {
+    &usage unless &dsc_xlat_arg($');
+    shift @ARGV;
+}
+&usage if $ARGV[0] =~ /^-./;
+
 &parse;
 
 $out[0][0] = "Pos";
@@ -17,13 +31,7 @@
     push(@{ $out[1] }, $order{$_}[0]);
     @f = split(/\s+/, $_);
     push(@{ $out[2] }, $f[1]);
-    my $dsc = $dsc{$_};
-    if (!defined $dsc) {
-       for (&eq($_)) {
-           $dsc = $dsc{$_};
-           last if defined $dsc;
-       }
-    }
+    my $dsc = &dsc_find($_);
     print STDERR "$_: no description\n" unless defined $dsc;
     push(@{ $out[3] }, defined $dsc ? $dsc : "???");
     push(@{ $out[4] }, $order{$_}[1]);

Modified: trunk/gta02-core/bom/Makefile
===================================================================
--- trunk/gta02-core/bom/Makefile       2010-02-07 17:46:18 UTC (rev 5835)
+++ trunk/gta02-core/bom/Makefile       2010-02-08 03:47:47 UTC (rev 5836)
@@ -11,7 +11,8 @@
 CHR=darfon.chr ralec.chr avx.chr acx.chr misc.chr
 SCH=audio bt cpu-power cpu gps io lcm memory modem pmu sd-sim usb wlan
 
-.PHONY:                all optimist pessimist spotless show-dup show-missing 
show-dk
+.PHONY:                all optimist pessimist spotless
+.PHONY:                show-dup show-missing show-dk show-fic
 .PHONY:                ann sch gen generate gv xpdf upload
 
 all:           gta02-core.ord
@@ -67,16 +68,22 @@
                $(BOOM) ./pardup.pl gta02-core.par
 
 show-missing:  $(EQU) fic/fic.dsc
-               (echo '#ORD'; grep MISSING gta02-core.ord ; ) | \
+               (echo '#ORD'; grep '^MISSING ' gta02-core.ord ; ) | \
                  $(BOOM) prettyord - $(EQU) fic/fic.dsc | \
                  sed 's/^...  \(.\{,78\}\).*/\1/'
 
 show-dk:
-               (echo '#ORD'; grep DIGI-KEY gta02-core.ord ; ) | \
+               (echo '#ORD'; grep '^DIGI-KEY ' gta02-core.ord ; ) | \
                  $(BOOM) prettyord - digi-key.dsc | \
                  sed 's/^...  //' | \
                  awk '{ s += $$(NF); print; } END { print "USD", s }'
 
+show-fic:      $(EQU) fic/fic.dsc
+               (echo '#ORD'; grep '^FIC ' gta02-core.ord ; ) | \
+                 $(BOOM) prettyord '-s/OldPn (\S+)/FIC/' \
+                 - $(EQU) fic/fic.dsc | \
+                 sed 's/^...  \(.\{,78\}\).*/\1/'
+
 #ANN = pmu
 ANN = audio
 ann:           ../$(ANN).sch fic/fic.dsc gta02-core.par $(EQU)
@@ -86,7 +93,8 @@
 $(SCH:%=%-bom.sch): \
                $(SCH:%=../%.sch) fic/fic.dsc gta02-core.$(ANNOTATE) $(EQU)
                for n in $(SCH); do \
-                   $(BOOM) annotate ../$$n.sch fic/fic.dsc \
+                   $(BOOM) annotate '-s/OldPn (\S+)/FIC/' \
+                     ../$$n.sch fic/fic.dsc \
                      gta02-core.$(ANNOTATE) $(EQU) >$$n-bom.sch \
                      || { rm -f $$n-bom.sch; exit 1; }; \
                done




--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to