[paparazzi-commits] [4198] fix bug for airframe file in subdirectory

[Pascal Brisset]

Revision: 4198
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4198
Author:   hecto
Date:     2009-09-23 19:15:40 +0000 (Wed, 23 Sep 2009)
Log Message:
-----------
 fix bug for airframe file in subdirectory

Modified Paths:
--------------
    paparazzi3/trunk/Makefile.ac
    paparazzi3/trunk/sw/tools/gen_aircraft.ml

Modified: paparazzi3/trunk/Makefile.ac
===================================================================
--- paparazzi3/trunk/Makefile.ac        2009-09-21 22:07:14 UTC (rev 4197)
+++ paparazzi3/trunk/Makefile.ac        2009-09-23 19:15:40 UTC (rev 4198)
@@ -80,7 +80,6 @@
        @echo BUILD $@
        $(Q)$(TOOLS)/gen_airframe.out $(AC_ID) $(AIRCRAFT) $(MD5SUM) $< > 
/tmp/airframe.h
        $(Q)mv /tmp/airframe.h $@
-       $(Q)cp $< $(AIRCRAFT_CONF_DIR)/airframes
        $(Q)cp $(CONF)/airframes/airframe.dtd $(AIRCRAFT_CONF_DIR)/airframes
 
 $(RADIO_H) : $(CONF)/$(RADIO) $(CONF_XML) $(TOOLS)/gen_radio.out

Modified: paparazzi3/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_aircraft.ml   2009-09-21 22:07:14 UTC (rev 
4197)
+++ paparazzi3/trunk/sw/tools/gen_aircraft.ml   2009-09-23 19:15:40 UTC (rev 
4198)
@@ -34,8 +34,7 @@
 let modules_dir = paparazzi_conf // "modules"
 
 let mkdir = fun d ->
-  if not (Sys.file_exists d) then
-    U.mkdir d 0o755
+  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 ->
@@ -236,6 +235,11 @@
                close_out f end;
 
     let airframe_file = value "airframe" in
+
+    let airframe_dir = Filename.dirname airframe_file in
+    let var_airframe_dir = aircraft_conf_dir // airframe_dir in
+    mkdir var_airframe_dir;
+    assert (Sys.command (sprintf "cp %s %s" (paparazzi_conf // airframe_file) 
var_airframe_dir) = 0);
     
     (** Calls the Makefile with target and options *)
     let make = fun target options ->