From: Keith Packard <keithp@keithp.com>
Date: Tue, 11 Feb 2025 01:14:46 +0000 (-0800)
Subject: Pass fillparts parameters on the command line
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=31cd8cb434e7df8723284a47897db6c8b928e211;p=hw%2Faltusmetrum

Pass fillparts parameters on the command line

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

diff --git a/pcb-rnd.mk b/pcb-rnd.mk
index e5827ba..3c7e7ca 100644
--- a/pcb-rnd.mk
+++ b/pcb-rnd.mk
@@ -24,14 +24,14 @@ $(PROJECT).drc: $(SCHEMATICS) Makefile $(CONFIG)
 
 partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslist-mouser.csv partslist-other.csv
 
-partslist:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
+partslist:	$(SCHEMATICS) Makefile $(AM)/preferred-parts.ods $(CONFIG)
 	lepton-netlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
-	$(AM)/bin/fillpartslist.py < $(PROJECT).unsorted > $@
+	$(AM)/bin/fillpartslist.py $(PROJECT).unsorted --output $@ --preferred $(AM)/preferred-parts.ods
 	rm -f $(PROJECT).unsorted
 
-partslist.csv:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
+partslist.csv:	$(SCHEMATICS) Makefile $(AM)/preferred-parts.ods $(CONFIG)
 	lepton-netlist -L $(SCHEME) -g bomAM -o $(PROJECT).csvtmp $(SCHEMATICS)
-	$(AM)/bin/fillpartscsv.py < $(PROJECT).csvtmp > $@
+	$(AM)/bin/fillpartscsv.py $(PROJECT).csvtmp --output $@ --preferred $(AM)/preferred-parts.ods
 	rm -f $(PROJECT).csvtmp
 
 partslist-dk.csv: partslist.csv
diff --git a/pcb.mk b/pcb.mk
index ed4fa90..b5b9502 100644
--- a/pcb.mk
+++ b/pcb.mk
@@ -24,14 +24,14 @@ $(PROJECT).drc: $(SCHEMATICS) Makefile $(CONFIG)
 
 partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslist-mouser.csv partslist-other.csv
 
-partslist:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
+partslist:	$(SCHEMATICS) Makefile $(AM)/preferred-parts.ods $(CONFIG)
 	gnetlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
-	$(AM)/bin/fillpartslist.py  < $(PROJECT).unsorted > $@
+	$(AM)/bin/fillpartslist.py $(PROJECT).unsorted --output $@ --preferred $(AM)/preferred-parts.ods
 	rm -f $(PROJECT).unsorted
 
-partslist.csv:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
+partslist.csv:	$(SCHEMATICS) Makefile $(AM)/preferred-parts.ods $(CONFIG)
 	gnetlist -L $(SCHEME) -g bomAM -o $(PROJECT).csvtmp $(SCHEMATICS)
-	$(AM)/bin/fillpartscsv.py < $(PROJECT).csvtmp > $@
+	$(AM)/bin/fillpartscsv.py $(PROJECT).csvtmp --output $@ --preferred $(AM)/preferred-parts.ods
 	rm -f $(PROJECT).csvtmp
 
 partslist-dk.csv: partslist.csv