aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--demo/thirdparty/unlockoslo-alpha-3/build.ninja7
-rw-r--r--demo/thirdparty/unlockoslo-alpha-3/eeconfig (renamed from demo/thirdparty/unlockoslo-alpha-3/.ee/config)0
-rw-r--r--src/ee/tools/templates/build.ninja.j26
3 files changed, 8 insertions, 5 deletions
diff --git a/demo/thirdparty/unlockoslo-alpha-3/build.ninja b/demo/thirdparty/unlockoslo-alpha-3/build.ninja
index 3bf21f6..9ed567f 100644
--- a/demo/thirdparty/unlockoslo-alpha-3/build.ninja
+++ b/demo/thirdparty/unlockoslo-alpha-3/build.ninja
@@ -39,7 +39,7 @@ rule element14-normalize-facts
rule create-order
description = create-order
- command = $ee create-order --schematic $schematic --part-db $part_dbs --out $out
+ command = $ee create-order --schematic $schematic --part-db $part_dbs --out $out $strategy
rule import-parts-yaml
description = import-parts-yaml $in
@@ -51,7 +51,6 @@ build prod/gerber.zip: kicad-gerber $pcb
gerber_dir = prod
build ee/sch.xml: kicad-make-bom $sch
- strategy =
# Distributor digikey
build ee/digikey/search-list.xml: part-create-distributor-search-list ee/sch.xml
@@ -68,3 +67,7 @@ build ee/order.xml | $report_dir/order.rst: create-order ee/sch.xml ee/digikey/n
part_dbs = ee/digikey/normalized.xml
default ee/order.xml
+
+rule seeed-download-opl
+ description = seeed-download-opl $opl
+ command = $ee seeed-download-opl --out $out --opl $opl
diff --git a/demo/thirdparty/unlockoslo-alpha-3/.ee/config b/demo/thirdparty/unlockoslo-alpha-3/eeconfig
index c7e2990..c7e2990 100644
--- a/demo/thirdparty/unlockoslo-alpha-3/.ee/config
+++ b/demo/thirdparty/unlockoslo-alpha-3/eeconfig
diff --git a/src/ee/tools/templates/build.ninja.j2 b/src/ee/tools/templates/build.ninja.j2
index 6efe20b..2a56bdc 100644
--- a/src/ee/tools/templates/build.ninja.j2
+++ b/src/ee/tools/templates/build.ninja.j2
@@ -82,7 +82,7 @@ build {{ out }}: import-parts-yaml {{ f }}
build ee/order.xml | $report_dir/order.rst: create-order ee/sch.xml {%- for p in part_dbs %} {{ p }}.xml{% endfor %}
schematic = ee/sch.xml
part_dbs ={%- for p in part_dbs %} {{ p }}.xml{% endfor %}
-{%- if project.cfg["create-order"]["strategy"] %}
+{%- if project.cfg["create-order"] and project.cfg["create-order"]["strategy"] %}
strategy = --strategy {{ project.cfg["create-order"]["strategy"] }}
{%- endif %}
@@ -92,7 +92,7 @@ rule seeed-download-opl
description = seeed-download-opl $opl
command = $ee seeed-download-opl --out $out --opl $opl
-{% if project.cfg.has_section("seeed-opl") -%}
+{%- if project.cfg.has_section("seeed-opl") -%}
{% set opls=project.cfg["seeed-opl"]["opls"].split(",") -%}
build seeed-download-opls: phony{%- for opl in opls %} ee/seeed/opl/{{ opl.strip() }}.xml{% endfor %}
{%- for opl in opls %}
@@ -101,4 +101,4 @@ build seeed-download-opls: phony{%- for opl in opls %} ee/seeed/opl/{{ opl.strip
build ee/seeed/opl/{{ opl }}.xml: seeed-download-opl
opl = {{ opl }}
{% endfor -%}
-{% endif -%}
+{% endif %}