o Replacing digikey-normalize-facts with part-apply-function. Moving

code from tool to ee.digikey.functions.

1 files changed, 14 insertions, 13 deletions

diff --git a/src/ee/tools/templates/build.ninja.j2 b/src/ee/tools/templates/build.ninja.j2
index 0aaa76f..cb98921 100644
--- a/src/ee/tools/templates/build.ninja.j2
+++ b/src/ee/tools/templates/build.ninja.j2
@@ -26,7 +26,7 @@ rule pn-part-search-list
     command = $ee pn-part-search-list --in $in --out $out --supplier $supplier
 
 rule part-apply-function
-    command = $ee part-apply-function --in $in --out $out $functions $arguments
+    command = $ee part-apply-function --execution $execution --in $in --out $out $functions $arguments
 
 rule part-find-requirements
     description = part-find-requirements
@@ -39,18 +39,10 @@ rule digikey-search-parts
     description = digikey-search-parts
     command = $ee digikey-search-parts --in $in --out $out
 
-rule digikey-normalize-facts
-    description = digikey-normalize-facts
-    command = $ee digikey-normalize-facts --in $in --out $out
-
 rule element14-search-parts
     description = element14-search-parts
     command = $ee element14-search-parts --in $in --out $out
 
-rule element14-normalize-facts
-    description = element14-normalize-facts
-    command = $ee element14-normalize-facts --in $in --out $out
-
 rule create-bom
     description = create-bom
     command = $ee create-bom --schematic $schematic --part-db $part_dbs --out $out $strategy
@@ -81,6 +73,7 @@ build {{ gerber_zip }}: kicad-gerber $pcb
 {% if sch is defined -%}
 build ee/kicad-sch.xml: kicad-make-bom $sch
 build ee/sch.xml: part-apply-function ee/kicad-sch.xml
+    execution = kicad
 {%- if project.cfg["kicad-project"]["functions"] %}
     functions = --function {{ project.cfg["kicad-project"]["functions"] }}
 {%- else %}
@@ -89,7 +82,7 @@ build ee/sch.xml: part-apply-function ee/kicad-sch.xml
 {%- if project.cfg["kicad-project"]["function-arguments"] %}
     arguments = --argument {{ project.cfg["kicad-project"]["function-arguments"] }}
 {%- else %}
-    arguments = --argument ""
+    arguments =
 {%- endif %}
 {%- endif %}
 
@@ -98,15 +91,23 @@ build $report_dir/part-validate-parts.rst: part-validate-parts ee/sch.xml
 build ee/requirements.xml: part-find-requirements ee/sch.xml
 
 {% for s in distributors %}
+{%- set cfg = project.cfg["supplier:" + s] if "supplier:" + s in project.cfg else None %}
 # Supplier {{ s }}
 build ee/{{ s }}/pn-part-search-list.xml: pn-part-search-list ee/sch.xml
     supplier = {{ s }}
 
 build ee/{{ s }}/downloaded.xml | ee/{{ s }}/downloaded.rst: {{ s }}-search-parts ee/{{ s }}/pn-part-search-list.xml
 
-build ee/{{ s }}/parts.xml: {{ s }}-normalize-facts ee/{{ s }}/downloaded.xml
-
-default ee/{{ s }}/parts.xml
+build ee/{{ s }}/parts.xml: part-apply-function ee/{{ s }}/downloaded.xml
+    execution = {{ s }}
+{%- if cfg and "functions" in cfg %}
+    functions = --function {{ cfg["functions"] }}
+{%- else %}
+    functions = --function ee.{{ s }}.functions.default
+{%- endif %}
+{%- if cfg and "function-arguments" in cfg %}
+    arguments = --argument {{ cfg["function-arguments"] }}
+{%- endif %}
 {%- endfor %}
 
 {%- for f in parts_yaml_files %}