Skip to content

Commit

Permalink
[build] don't print infos on stderr
Browse files Browse the repository at this point in the history
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..
  • Loading branch information
flixr committed Nov 7, 2014
1 parent a21ea1e commit 81aa9e9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
16 changes: 9 additions & 7 deletions Makefile.ac
Expand Up @@ -124,7 +124,7 @@ makefile_ac: $(MAKEFILE_AC)

$(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5)
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo GENERATE $@
@echo GENERATE $@ from $(AIRFRAME_XML)
$(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_airframe.out $(AC_ID) $(AIRCRAFT) $(MD5SUM) $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
Expand All @@ -133,7 +133,7 @@ $(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5)

$(RADIO_H) : $(CONF)/$(RADIO) $(CONF_XML) $(GENERATORS)/gen_radio.out
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo GENERATE $@
@echo GENERATE $@ from $(RADIO)
$(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_radio.out $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
Expand All @@ -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)
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo GENERATE $@
@echo GENERATE $@ from $(TELEMETRY)
$(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_periodic.out $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF)/$(TELEMETRY) $(TELEMETRY_FREQUENCY) $(SETTINGS_TELEMETRY) > $($@_TMP)
$(Q)mv $($@_TMP) $@
Expand All @@ -151,15 +151,15 @@ $(PERIODIC_H) : $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF_XML) $(CONF)/$(TE

$(FLIGHT_PLAN_H) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(GENERATORS)/gen_flight_plan.out
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo GENERATE $@
@echo GENERATE $@ from $(FLIGHT_PLAN)
$(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_flight_plan.out $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(Q)cp $< $(AIRCRAFT_CONF_DIR)/flight_plans

$(FLIGHT_PLAN_XML) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(GENERATORS)/gen_flight_plan.out
@echo GENERATE $@
@echo GENERATE $@ from $(FLIGHT_PLAN)
$(eval $@_TMP := $(shell $(MKTEMP)))
$(Q)$(GENERATORS)/gen_flight_plan.out -dump $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
Expand Down Expand Up @@ -191,8 +191,10 @@ $(SETTINGS_MODULES) : $(MODULES_H)
$(SETTINGS_TELEMETRY) : $(PERIODIC_H)

%.ac_h : $(GENERATORS)/gen_aircraft.out
$(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type 'make AIRCRAFT=AircraftName ...'"; exit 1; fi
@echo BUILD $(AIRCRAFT), TARGET $*
$(Q)if (expr "$(AIRCRAFT)") > /dev/null; then : ; else echo "AIRCRAFT undefined: type 'make AIRCRAFT=AircraftName ...'"; exit 1; fi
@echo "#######################################"
@echo "# BUILD AIRCRAFT=$(AIRCRAFT), TARGET $*"
@echo "#######################################"
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) TARGET=$* Q=$(Q) $(GENERATORS)/gen_aircraft.out $(AIRCRAFT)

%.compile: %.ac_h | print_version
Expand Down
2 changes: 1 addition & 1 deletion sw/supervision/paparazzicenter.ml
Expand Up @@ -207,7 +207,7 @@ let () =
let errors = "red", ["error"; "no such file"; "undefined reference"; "failure"; "multiple definition"]
and warnings = "orange", ["warning"]
and info = "green", ["pragma message"]
and version = "cyan", ["paparazzi version"] in
and version = "cyan", ["paparazzi version"; "build aircraft"] in

let color_regexps =
List.map (fun (color, strings) ->
Expand Down
2 changes: 1 addition & 1 deletion sw/tools/generators/gen_airframe.ml
Expand Up @@ -319,7 +319,7 @@ let _ =
and md5sum = Sys.argv.(3) in
try
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 "AC_ID" ac_id;
define "MD5SUM" (sprintf "((uint8_t*)\"%s\")" (hex_to_bin md5sum));
Expand Down
2 changes: 1 addition & 1 deletion sw/tools/generators/gen_flight_plan.ml
Expand Up @@ -797,7 +797,7 @@ let () =
end;

let name = ExtXml.attrib xml "name" in
Xml2h.warning ("FLIGHT PLAN: "^name);
(* Xml2h.warning ("FLIGHT PLAN: "^name); *)
Xml2h.define_string "FLIGHT_PLAN_NAME" name;

let get_float = fun x -> float_attrib xml x in
Expand Down
2 changes: 1 addition & 1 deletion sw/tools/generators/gen_radio.ml
Expand Up @@ -145,7 +145,7 @@ let _ =
nl ();
let channels = Xml.children xml in
let n = ExtXml.attrib xml "name" in
Xml2h.warning ("RADIO MODEL: "^n);
(* Xml2h.warning ("RADIO MODEL: "^n); *)
define_string "RADIO_NAME" n;
nl ();
(*define "RADIO_CONTROL_NB_CHANNEL" (string_of_int (List.length channels));*)
Expand Down

0 comments on commit 81aa9e9

Please sign in to comment.