From d108963a31f726ec8e1f471695addbbabb0db312 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Mon, 27 May 2019 23:15:43 +0200
Subject: o Setting tool output to warn by default when running through ninja.

---
 src/ee/tools/templates/build.ninja.j2 | 43 ++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/ee/tools/templates/build.ninja.j2 b/src/ee/tools/templates/build.ninja.j2
index 5ae6085..dbfe8f0 100644
--- a/src/ee/tools/templates/build.ninja.j2
+++ b/src/ee/tools/templates/build.ninja.j2
@@ -1,7 +1,7 @@
 {% set reports=[] -%}
-ee = {{ ee }}
-uuid = {{ project.uuid }}
-report_dir = {{ project.report_dir }}
+ee = {{ ee }}
+uuid = {{ project.uuid }}
+report_dir = {{ project.report_dir }}
 {%- if sch is defined %}
 sch = {{ sch | ninja_path }}
 sch_files = {{ sch_files | ninja_path }}
@@ -9,6 +9,7 @@ sch_files = {{ sch_files | ninja_path }}
 {%- if pcb is defined %}
 pcb = {{ pcb | ninja_path }}
 {%- endif %}
+{%- set log=log if log is defined else "--log=warn" %}
 
 rule kicad-gerber
     description = kicad-gerber
@@ -20,60 +21,54 @@ rule kicad-gerber
 #    mv $(GERBER_DIR)/tmp.zip $@
 
 rule kicad-make-bom
-    description = kicad-make-bom $out
-    command = $ee kicad-make-bom --sch $sch --out $out --uuid $uuid
+    command = $ee kicad-make-bom {{ log }} --sch $sch --out $out --uuid $uuid
 
 rule pn-part-search-list
     description = pn-part-search-list supplier: $supplier
-    command = $ee pn-part-search-list --in $in --out $out --supplier $supplier
+    command = $ee pn-part-search-list {{ log }} --in $in --out $out --supplier $supplier
 
 rule part-apply-function
-    command = $ee part-apply-function --execution $execution --in $in --out $out $functions $arguments
+    command = $ee part-apply-function {{ log }} --execution $execution --in $in --out $out $functions $arguments
 
 rule part-apply-souffle-pre
-    command = $ee part-apply-souffle-pre --in $in --work $work
+    command = $ee part-apply-souffle-pre {{ log }} --in $in --work $work
 
 rule souffle
     command = souffle -F $work/in -D $work/out -I $work -I "{{ souffle_ee_src }}" $in
 
 rule part-apply-souffle-post
-    command = $ee part-apply-souffle-post --in $in_sch --out $out --work $work
+    command = $ee part-apply-souffle-post {{ log }} --in $in_sch --out $out --work $work
 
 rule part-find-requirements
-    description = part-find-requirements
-    command = $ee part-find-requirements --in $in --out $out $report
+    command = $ee part-find-requirements {{ log }} --in $in --out $out $report
 
 rule part-validate-parts
-    command = $ee part-validate-parts --in $in --out $out
+    command = $ee part-validate-parts {{ log }} --in $in --out $out
 
 rule digikey-search-parts
-    description = digikey-search-parts
-    command = $ee digikey-search-parts --in $in --out $out
+    command = $ee digikey-search-parts {{ log }} --in $in --out $out
 
 rule element14-search-parts
-    description = element14-search-parts
-    command = $ee element14-search-parts --in $in --out $out
+    command = $ee element14-search-parts {{ log }} --in $in --out $out
 
 rule create-bom
-    description = create-bom
-    command = $ee create-bom --schematic $schematic --part-db $part_dbs --out $out $strategy
+    command = $ee create-bom {{ log }} --schematic $schematic --part-db $part_dbs --out $out $strategy
 
 rule split-parts-by-supplier
-    description = split-parts-by-supplier
-    command = $ee split-parts-by-supplier --parts $order $part_dbs --out-dir $out_dir
+    command = $ee split-parts-by-supplier {{ log }} --parts $order $part_dbs --out-dir $out_dir
 
 rule import-parts-yaml
     description = import-parts-yaml $in
-    command = $ee import-parts-yaml --in $in --out $out
+    command = $ee import-parts-yaml {{ log }} --in $in --out $out
 
 rule drawio-decompress
-    command = $ee drawio-decompress --in $in --out $out
+    command = $ee drawio-decompress {{ log }} --in $in --out $out
 
 rule drawio-to-parts
-    command = $ee drawio-to-parts --in $in --out $out $args
+    command = $ee drawio-to-parts {{ log }} --in $in --out $out $args
 
 rule part-from-excel
-    command = $ee part-from-excel --in $in --out $out --sheet "$sheet"
+    command = $ee part-from-excel {{ log }} --in $in --out $out --sheet "$sheet"
 
 {% if gerber_zip is defined %}
 build gerbers: phony {{ gerber_zip }}
-- 
cgit v1.2.3