Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[generators] gen_aircraft: don't add valid modules twice

Browse Source
This commit is contained in:
Felix Ruess
2016-02-07 13:18:26 +01:00
parent 987755f61f
commit 2274b3eb30
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/tools/generators/gen_aircraft.ml
+5 -5
View File
@@ -178,10 +178,10 @@ let subsystem_configure_xml2mk = fun f s ->
let s_config, _ = ExtXml.partition_tag "configure" (Xml.children s) in let s_config, _ = ExtXml.partition_tag "configure" (Xml.children s) in
List.iter (configure_xml2mk f) s_config List.iter (configure_xml2mk f) s_config
let mod_or_subsys_xml2mk = fun f global_targets firmware target xml -> (** if xml node valid module, do notihg, otherwise fall back to subsystem *)
let fallback_subsys_xml2mk = fun f global_targets firmware target xml ->
try try
let m = Gen_common.get_module xml global_targets in ignore(Gen_common.get_module xml global_targets)
module_xml2mk f target m;
with Gen_common.Subsystem _file -> subsystem_xml2mk f firmware xml with Gen_common.Subsystem _file -> subsystem_xml2mk f firmware xml
let parse_firmware = fun makefile_ac ac_xml firmware -> let parse_firmware = fun makefile_ac ac_xml firmware ->
@@ -221,8 +221,8 @@ let parse_firmware = fun makefile_ac ac_xml firmware ->
List.iter (fun def -> define_xml2mk makefile_ac def) defines; List.iter (fun def -> define_xml2mk makefile_ac def) defines;
List.iter (fun def -> define_xml2mk makefile_ac def) t_defines; List.iter (fun def -> define_xml2mk makefile_ac def) t_defines;
List.iter (module_xml2mk makefile_ac target_name) modules; List.iter (module_xml2mk makefile_ac target_name) modules;
List.iter (mod_or_subsys_xml2mk makefile_ac [] firmware target_name) mods; List.iter (fallback_subsys_xml2mk makefile_ac [] firmware target_name) mods;
List.iter (mod_or_subsys_xml2mk makefile_ac [] firmware target_name) t_mods; List.iter (fallback_subsys_xml2mk makefile_ac [] firmware target_name) t_mods;
List.iter (subsystem_xml2mk makefile_ac firmware) t_subsystems; List.iter (subsystem_xml2mk makefile_ac firmware) t_subsystems;
List.iter (subsystem_xml2mk makefile_ac firmware) subsystems; List.iter (subsystem_xml2mk makefile_ac firmware) subsystems;
fprintf makefile_ac "\nendif # end of target '%s'\n\n" target_name fprintf makefile_ac "\nendif # end of target '%s'\n\n" target_name