From: Keith Packard <keithp@keithp.com>
Date: Mon, 10 Feb 2025 22:44:38 +0000 (-0800)
Subject: Switch to using preferred-parts.ods in makefile fragments
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=7e60739a5c43877644b5325f5411c8988a794713;p=hw%2Faltusmetrum

Switch to using preferred-parts.ods in makefile fragments

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/pcb-rnd.mk b/pcb-rnd.mk
index d41f780..e5827ba 100644
--- a/pcb-rnd.mk
+++ b/pcb-rnd.mk
@@ -26,14 +26,13 @@ partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslis
 
 partslist:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
 	lepton-netlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
-	head -n1 $(PROJECT).unsorted > partslist
-	tail -n+2 $(PROJECT).unsorted | sort | awk -f $(AM)/bin/fillpartslist >> partslist
+	$(AM)/bin/fillpartslist.py < $(PROJECT).unsorted > $@
 	rm -f $(PROJECT).unsorted
 
 partslist.csv:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
 	lepton-netlist -L $(SCHEME) -g bomAM -o $(PROJECT).csvtmp $(SCHEMATICS)
-	(head -n1 $(PROJECT).csvtmp; tail -n+2 $(PROJECT).csvtmp | sort -t \, -k 8 | \
-		awk -f $(AM)/bin/fillpartscsv | sort ) > $@ && rm -f $(PROJECT).csvtmp
+	$(AM)/bin/fillpartscsv.py < $(PROJECT).csvtmp > $@
+	rm -f $(PROJECT).csvtmp
 
 partslist-dk.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@
diff --git a/pcb.mk b/pcb.mk
index f282013..ed4fa90 100644
--- a/pcb.mk
+++ b/pcb.mk
@@ -26,13 +26,13 @@ partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslis
 
 partslist:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
 	gnetlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
-	head -n1 $(PROJECT).unsorted > partslist
-	tail -n+2 $(PROJECT).unsorted | sort | awk -f $(AM)/bin/fillpartslist >> partslist
+	$(AM)/bin/fillpartslist.py  < $(PROJECT).unsorted > $@
 	rm -f $(PROJECT).unsorted
 
 partslist.csv:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
 	gnetlist -L $(SCHEME) -g bomAM -o $(PROJECT).csvtmp $(SCHEMATICS)
-	(head -n1 $(PROJECT).csvtmp; tail -n+2 $(PROJECT).csvtmp | sort -t \, -k 8 | awk -f $(AM)/bin/fillpartscsv | sort ) > $@ && rm -f $(PROJECT).csvtmp
+	$(AM)/bin/fillpartscsv.py < $(PROJECT).csvtmp > $@
+	rm -f $(PROJECT).csvtmp
 
 partslist-dk.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@