Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-02-06 02:52:42 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[generators] gen_aircraft: possibility to specify conf.xml file

Browse Source
This commit is contained in:
Felix Ruess
2015-03-12 16:56:06 +01:00
parent e6c99050ae
commit 6d2acf227d
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.ac
View File

@@ -32,6 +32,14 @@ CONF_XML=$(CONF)/conf.xml
AIRBORNE=sw/airborne
MESSAGES_XML = $(CONF)/messages.xml
# make sure the TARGET variable is set if needed for current make target
ifneq (,$(findstring $(MAKECMDGOALS),all_ac_h radio_ac_h flight_plan_ac_h))
ifeq ($(TARGET),)
$(warning No TARGET specified! Defaulting to "TARGET=ap")
override TARGET=ap
endif
endif
AIRCRAFT_CONF_DIR = $(AIRCRAFT_BUILD_DIR)/conf
AC_GENERATED = $(AIRCRAFT_BUILD_DIR)/$(TARGET)/generated

13
sw/tools/generators/gen_aircraft.ml
View File

@@ -30,13 +30,13 @@ open Gen_common
let (//) = Filename.concat
let paparazzi_conf = Env.paparazzi_home // "conf"
let conf_xml = paparazzi_conf // "conf.xml"
let default_conf_xml = paparazzi_conf // "conf.xml"
let mkdir = fun d ->
assert (Sys.command (sprintf "mkdir -p %s" d) = 0)
(** Raises a Failure if an ID or a NAME appears twice in the conf *)
let check_unique_id_and_name = fun conf ->
let check_unique_id_and_name = fun conf conf_xml ->
let ids = Hashtbl.create 5
and names = Hashtbl.create 5 in
List.iter
@@ -315,11 +315,12 @@ let make_element = fun t a c -> Xml.Element (t,a,c)
(******************************* MAIN ****************************************)
let () =
try
if Array.length Sys.argv <> 2 then
failwith (sprintf "Usage: %s <A/C ident (conf.xml)>" Sys.argv.(0));
if Array.length Sys.argv < 2 || Array.length Sys.argv > 3 then
failwith (sprintf "Usage: %s <Aircraft name> [conf.xml]" Sys.argv.(0));
let aircraft = Sys.argv.(1) in
let conf_xml = if Array.length Sys.argv = 3 then Sys.argv.(2) else default_conf_xml in
let conf = Xml.parse_file conf_xml in
check_unique_id_and_name conf;
check_unique_id_and_name conf conf_xml;
let aircraft_xml =
try
ExtXml.child conf ~select:(fun x -> Xml.attrib x "name" = aircraft) "aircraft"
@@ -422,7 +423,7 @@ let () =
end;
(* Get TARGET env, needed to build modules.h according to the target *)
let t = Printf.sprintf "TARGET=%s" (try Sys.getenv "TARGET" with _ -> "") in
let t = try Printf.sprintf "TARGET=%s" (Sys.getenv "TARGET") with _ -> "" in
make "all_ac_h" t;
make_opt "radio_ac_h" "RADIO" "radio";
make_opt "flight_plan_ac_h" "FLIGHT_PLAN" "flight_plan"