Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 03:57:45 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[build] don't print infos on stderr

Browse Source 
generators should only output on stderr if there actually was an error.
Rather echo to stdout from the makefile to print the info.

This makes it possible to redirect stderr on compiling/testing to a buffer/file.
E.g. to check if there were warnings..
This commit is contained in:
Felix Ruess
2014-11-07 17:18:44 +01:00
parent a21ea1e91d
commit 81aa9e90c2
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.ac
+9 -7
View File
@@ -124,7 +124,7 @@ makefile_ac: $(MAKEFILE_AC)
$(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5) $(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5)
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo GENERATE $@ @echo GENERATE $@ from $(AIRFRAME_XML)
$(eval $@_TMP := $(shell $(MKTEMP))) $(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_airframe.out $(AC_ID) $(AIRCRAFT) $(MD5SUM) $< > $($@_TMP) $(Q)$(GENERATORS)/gen_airframe.out $(AC_ID) $(AIRCRAFT) $(MD5SUM) $< > $($@_TMP)
$(Q)mv $($@_TMP) $@ $(Q)mv $($@_TMP) $@
@@ -133,7 +133,7 @@ $(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5)
$(RADIO_H) : $(CONF)/$(RADIO) $(CONF_XML) $(GENERATORS)/gen_radio.out $(RADIO_H) : $(CONF)/$(RADIO) $(CONF_XML) $(GENERATORS)/gen_radio.out
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo GENERATE $@ @echo GENERATE $@ from $(RADIO)
$(eval $@_TMP := $(shell $(MKTEMP))) $(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_radio.out $< > $($@_TMP) $(Q)$(GENERATORS)/gen_radio.out $< > $($@_TMP)
$(Q)mv $($@_TMP) $@ $(Q)mv $($@_TMP) $@
@@ -142,7 +142,7 @@ $(RADIO_H) : $(CONF)/$(RADIO) $(CONF_XML) $(GENERATORS)/gen_radio.out
$(PERIODIC_H) : $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF_XML) $(CONF)/$(TELEMETRY) $(MAKEFILE_AC) $(PERIODIC_H) : $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF_XML) $(CONF)/$(TELEMETRY) $(MAKEFILE_AC)
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo GENERATE $@ @echo GENERATE $@ from $(TELEMETRY)
$(eval $@_TMP := $(shell $(MKTEMP))) $(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_periodic.out $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF)/$(TELEMETRY) $(TELEMETRY_FREQUENCY) $(SETTINGS_TELEMETRY) > $($@_TMP) $(Q)$(GENERATORS)/gen_periodic.out $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF)/$(TELEMETRY) $(TELEMETRY_FREQUENCY) $(SETTINGS_TELEMETRY) > $($@_TMP)
$(Q)mv $($@_TMP) $@ $(Q)mv $($@_TMP) $@
@@ -151,7 +151,7 @@ $(PERIODIC_H) : $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF_XML) $(CONF)/$(TE
$(FLIGHT_PLAN_H) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(GENERATORS)/gen_flight_plan.out $(FLIGHT_PLAN_H) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(GENERATORS)/gen_flight_plan.out
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo GENERATE $@ @echo GENERATE $@ from $(FLIGHT_PLAN)
$(eval $@_TMP := $(shell $(MKTEMP))) $(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_flight_plan.out $< > $($@_TMP) $(Q)$(GENERATORS)/gen_flight_plan.out $< > $($@_TMP)
$(Q)mv $($@_TMP) $@ $(Q)mv $($@_TMP) $@
@@ -159,7 +159,7 @@ $(FLIGHT_PLAN_H) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(GENERATORS)/gen_flight_p
$(Q)cp $< $(AIRCRAFT_CONF_DIR)/flight_plans $(Q)cp $< $(AIRCRAFT_CONF_DIR)/flight_plans
$(FLIGHT_PLAN_XML) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(GENERATORS)/gen_flight_plan.out $(FLIGHT_PLAN_XML) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(GENERATORS)/gen_flight_plan.out
@echo GENERATE $@ @echo GENERATE $@ from $(FLIGHT_PLAN)
$(eval $@_TMP := $(shell $(MKTEMP))) $(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_flight_plan.out -dump $< > $($@_TMP) $(Q)$(GENERATORS)/gen_flight_plan.out -dump $< > $($@_TMP)
$(Q)mv $($@_TMP) $@ $(Q)mv $($@_TMP) $@
@@ -191,8 +191,10 @@ $(SETTINGS_MODULES) : $(MODULES_H)
$(SETTINGS_TELEMETRY) : $(PERIODIC_H) $(SETTINGS_TELEMETRY) : $(PERIODIC_H)
%.ac_h : $(GENERATORS)/gen_aircraft.out %.ac_h : $(GENERATORS)/gen_aircraft.out
$(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type 'make AIRCRAFT=AircraftName ...'"; exit 1; fi $(Q)if (expr "$(AIRCRAFT)") > /dev/null; then : ; else echo "AIRCRAFT undefined: type 'make AIRCRAFT=AircraftName ...'"; exit 1; fi
@echo BUILD $(AIRCRAFT), TARGET $* @echo "#######################################"
@echo "# BUILD AIRCRAFT=$(AIRCRAFT), TARGET $*"
@echo "#######################################"
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) TARGET=$* Q=$(Q) $(GENERATORS)/gen_aircraft.out $(AIRCRAFT) $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) TARGET=$* Q=$(Q) $(GENERATORS)/gen_aircraft.out $(AIRCRAFT)
%.compile: %.ac_h | print_version %.compile: %.ac_h | print_version
sw/supervision/paparazzicenter.ml
+1 -1
View File
@@ -207,7 +207,7 @@ let () =
let errors = "red", ["error"; "no such file"; "undefined reference"; "failure"; "multiple definition"] let errors = "red", ["error"; "no such file"; "undefined reference"; "failure"; "multiple definition"]
and warnings = "orange", ["warning"] and warnings = "orange", ["warning"]
and info = "green", ["pragma message"] and info = "green", ["pragma message"]
and version = "cyan", ["paparazzi version"] in and version = "cyan", ["paparazzi version"; "build aircraft"] in
let color_regexps = let color_regexps =
List.map (fun (color, strings) -> List.map (fun (color, strings) ->
sw/tools/generators/gen_airframe.ml
+1 -1
View File
@@ -319,7 +319,7 @@ let _ =
and md5sum = Sys.argv.(3) in and md5sum = Sys.argv.(3) in
try try
let xml = start_and_begin xml_file h_name in let xml = start_and_begin xml_file h_name in
Xml2h.warning ("AIRFRAME MODEL: "^ ac_name); (* Xml2h.warning ("AIRFRAME MODEL: "^ ac_name); *)
define_string "AIRFRAME_NAME" ac_name; define_string "AIRFRAME_NAME" ac_name;
define "AC_ID" ac_id; define "AC_ID" ac_id;
define "MD5SUM" (sprintf "((uint8_t*)\"%s\")" (hex_to_bin md5sum)); define "MD5SUM" (sprintf "((uint8_t*)\"%s\")" (hex_to_bin md5sum));
sw/tools/generators/gen_flight_plan.ml
+1 -1
View File
@@ -797,7 +797,7 @@ let () =
end; end;
let name = ExtXml.attrib xml "name" in let name = ExtXml.attrib xml "name" in
Xml2h.warning ("FLIGHT PLAN: "^name); (* Xml2h.warning ("FLIGHT PLAN: "^name); *)
Xml2h.define_string "FLIGHT_PLAN_NAME" name; Xml2h.define_string "FLIGHT_PLAN_NAME" name;
let get_float = fun x -> float_attrib xml x in let get_float = fun x -> float_attrib xml x in
sw/tools/generators/gen_radio.ml
+1 -1
View File
@@ -145,7 +145,7 @@ let _ =
nl (); nl ();
let channels = Xml.children xml in let channels = Xml.children xml in
let n = ExtXml.attrib xml "name" in let n = ExtXml.attrib xml "name" in
Xml2h.warning ("RADIO MODEL: "^n); (* Xml2h.warning ("RADIO MODEL: "^n); *)
define_string "RADIO_NAME" n; define_string "RADIO_NAME" n;
nl (); nl ();
(*define "RADIO_CONTROL_NB_CHANNEL" (string_of_int (List.length channels));*) (*define "RADIO_CONTROL_NB_CHANNEL" (string_of_int (List.length channels));*)