Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-27 17:06:31 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

[settings] add settings directly inside modules files

Browse Source
This commit is contained in:
Gautier Hattenberger
2014-09-30 13:57:17 +02:00
parent 5605864d75
commit 7230aa4a92
6 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/tools/generators/gen_settings.ml
+4 -1
View File
@@ -275,7 +275,10 @@ let join_xml_files = fun xml_files ->
try Xml.children (ExtXml.child xml "rc_settings") with
Not_found -> [] in
let these_dl_settings =
try Xml.children (ExtXml.child xml "dl_settings") with
try
(* test if the file is plain settings file or a module file *)
let xml = if Xml.tag xml = "module" then (ExtXml.child xml "settings") else xml in
Xml.children (ExtXml.child xml "dl_settings") with
Not_found -> [] in
rc_settings := these_rc_settings @ !rc_settings;
dl_settings := these_dl_settings @ !dl_settings)