paparazzi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [4177] add seach for procedures in default directory


From: Pascal Brisset
Subject: [paparazzi-commits] [4177] add seach for procedures in default directory; currently required for replay
Date: Fri, 18 Sep 2009 13:45:47 +0000

Revision: 4177
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4177
Author:   hecto
Date:     2009-09-18 13:45:47 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
 add seach for procedures in default directory; currently required for replay

Modified Paths:
--------------
    paparazzi3/trunk/sw/tools/fp_proc.ml

Modified: paparazzi3/trunk/sw/tools/fp_proc.ml
===================================================================
--- paparazzi3/trunk/sw/tools/fp_proc.ml        2009-09-18 13:43:22 UTC (rev 
4176)
+++ paparazzi3/trunk/sw/tools/fp_proc.ml        2009-09-18 13:45:47 UTC (rev 
4177)
@@ -192,7 +192,11 @@
 
 
 let parse_include = fun dir flight_plan include_xml ->
-  let f = Filename.concat dir (ExtXml.attrib include_xml "procedure") in
+  let f = 
+    let procedure = ExtXml.attrib include_xml "procedure" in
+    try Ocaml_tools.find_file [dir; Env.flight_plans_path] procedure with
+      Not_found ->
+       failwith (sprintf "parse_include: %s not found\n" procedure) in
   let proc_name = ExtXml.attrib include_xml "name" in
   let prefix = fun x -> proc_name ^ "." ^ x in
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]