From 9eba62ef1d6b4896de693976116f69a9692332d9 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Mon, 20 May 2019 15:27:38 +0200
Subject: ee: o Adding FactType as a smaller wrapper around the fact uri. o
 Adding ee.part.Facts, used as Part.facts o Renaming 'type' uri to
 'ee-component-type'. kicad-make-bom: Removing strategy functionality,
 replaced with part-apply-function. Moving default strategy contents into
 ee.kicad.functions.

---
 src/ee/tools/templates/build.ninja.j2 | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'src/ee/tools/templates')

diff --git a/src/ee/tools/templates/build.ninja.j2 b/src/ee/tools/templates/build.ninja.j2
index 76da4cf..1f9ba35 100644
--- a/src/ee/tools/templates/build.ninja.j2
+++ b/src/ee/tools/templates/build.ninja.j2
@@ -19,12 +19,19 @@ rule kicad-gerber
 
 rule kicad-make-bom
     description = kicad-make-bom $out
-    command = $ee kicad-make-bom --sch $sch --out $out $strategy
+    command = $ee kicad-make-bom --sch $sch --out $out
 
 rule pn-part-search-list
     description = pn-part-search-list supplier: $supplier
     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
+
+rule part-find-requirements
+    description = part-find-requirements
+    command = $ee part-find-requirements --in $in --out $out
+
 rule digikey-search-parts
     description = digikey-search-parts
     command = $ee digikey-search-parts --in $in --out $out
@@ -69,11 +76,17 @@ build {{ gerber_zip }}: kicad-gerber $pcb
 {%- endif %}
 
 {% if sch is defined -%}
-build ee/sch.xml: kicad-make-bom $sch
-{%- if project.cfg["kicad-project"]["strategy"] %}
-    strategy = --strategy {{ project.cfg["kicad-project"]["strategy"] }}
+build ee/kicad-sch.xml: kicad-make-bom $sch
+build ee/sch.xml: part-apply-function ee/kicad-sch.xml
+{%- if project.cfg["kicad-project"]["functions"] %}
+    functions = --function {{ project.cfg["kicad-project"]["functions"] }}
+{%- else %}
+    functions = --function ee.kicad.functions.default
 {%- endif %}
 {%- endif %}
+
+build ee/requirements.xml: part-find-requirements ee/sch.xml
+
 {% for s in distributors %}
 # Supplier {{ s }}
 build ee/{{ s }}/pn-part-search-list.xml: pn-part-search-list ee/sch.xml
-- 
cgit v1.2.3