[paparazzi-commits] [5721] values of defines got lost...

[Christophe De Wagter]

Revision: 5721
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5721
Author:   dewagter
Date:     2010-08-27 09:09:54 +0000 (Fri, 27 Aug 2010)
Log Message:
-----------
values of defines got lost...

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
    paparazzi3/trunk/sw/tools/gen_aircraft.ml

Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-27 07:56:32 UTC (rev 5720)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-27 09:09:54 UTC (rev 5721)
@@ -165,6 +165,7 @@
       <param name="FLASH_MODE"                 value="IAP" />
       <define name="AGR_CLIMB" />
       <define name="ALT_KALMAN" />
+      <define name="GENERIC" value="1" />
     </target>
     <target name="sim"                         board="pc" />
 

Modified: paparazzi3/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-27 07:56:32 UTC (rev 
5720)
+++ paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-27 09:09:54 UTC (rev 
5721)
@@ -239,9 +239,16 @@
 **)          fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
          let print_if_subsystem = (fun d ->
             if ExtXml.tag_is d "define" then begin
-              fprintf makefile_ac "%s.CFLAGS += -D%s\n"
+              let has_def_value = ref false in
+              begin try
+                has_def_value := not (String.compare (Xml.attrib d "value") "" 
= 0)
+              with _ -> () end;
+              fprintf makefile_ac "%s.CFLAGS += -D%s"
                 (Xml.attrib target "name")
-                (Xml.attrib d "name")
+                (Xml.attrib d "name");
+              if !has_def_value then
+                fprintf makefile_ac "=%s" (Xml.attrib d "value");
+              fprintf makefile_ac "\n"
             end) in
          List.iter print_if_subsystem (Xml.children target);
          List.iter (parse_subsystems makefile_ac tag) (Xml.children target ); 
(** dump target  subsystems **)