-2cw7: use variable in the generated script to be able to override default tool names.

_oasis

 OASISFormat: 0.4
 Name:        lustre-v6
-Version:     1.653
+Version:     1.654
 Synopsis:    The Lustre V6 Verimag compiler
 Description: This package contains:
    (1) lus2lic: the (current) name of the compiler (and interpreter via -exec).

src/lv6version.ml

 (** Automatically generated from Makefile *) 
 let tool = "lus2lic"
 let branch = "master"
-let commit = "653"
-let sha_1 = "06e1f9d35436d9720d771ee4584b57b3816f53bc"
+let commit = "654"
+let sha_1 = "579d15a3cca62430283d44d291684fca4d112454"
 let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
 let maintainer = "jahier@imag.fr"

src/soc2c.ml

-(* Time-stamp: <modified the 13/05/2016 (at 16:11) by Erwan Jahier> *)
+(* Time-stamp: <modified the 21/06/2016 (at 09:48) by Erwan Jahier> *)
 
 
 (* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *)
@@ -858,6 +858,18 @@ set -x
 otawa=\"true\"
 ogensim=\"true\"
 xpdf=\"true\"
+#ifndef OGENSIM
+  OGENSIM=osim.arm
+#endif
+#ifndef OTAWA
+  OTAWA=owcet.arm
+#endif
+#ifndef ORANGE
+  ORANGE=orange
+#endif
+#ifndef LUSTREV6
+  LUSTREV6=lus2lic
+#endif
 
 if [ $# -gt 0 ]
     then
@@ -890,7 +902,7 @@ then
 # ZZZ otawa won't work with programs that use division because of orange (!?)
 # Let's compile the c files for otawa\n" ^
           gcc ^ " > \\\n\t$n_n.owcet.log 2>&1 &&\n\n"^
-            "orange $cfile ${n_n}_step -o $n_n.ffx > $n_n.orange.log  2>&1 &&\n" ^
+            "$ORANGE $cfile ${n_n}_step -o $n_n.ffx > $n_n.orange.log  2>&1 &&\n" ^
 
 "
 IDIR=`readlink -f fixffx`
@@ -900,7 +912,7 @@ ARM_LOOPLOC=\"$IDIR/arm.looploc\"
 mkff -x $execfile > $n_n.ff
 fixffx $ARM_LOOPLOC -i $n_n.ff >  $n_n.fixed.ffx
 # Let's  run otawa (owcet.arm)\n" ^
-            "owcet.arm $execfile $main_step  -f $n_n.fixed.ffx -f $n_n.ffx  \\\n\t>"^
+            "$OTAWA $execfile $main_step  -f $n_n.fixed.ffx -f $n_n.ffx  \\\n\t>"^
               "$n_n.owcet.arm.log 2>&1 && \n"^
               "grep WCET $n_n.owcet.arm.log | cut -d \" \" -f 3 > "^
               "$n.wcet &&\n\n" ^ 
@@ -912,11 +924,11 @@ if [ \"$ogensim\" = \"true\" ]
 then
 # Now let's run ogensim \n(" ^
            gcc_ogensim ^ " >>$n_n.owcet.log  2>&1 &&\n"^
-           "lus2lic "^(String.concat " " args.infiles)^" -n $n"^
+           "$LUSTREV6 "^(String.concat " " args.infiles)^" -n $n"^
            " -interface > $n.io &&\n"^
-           "lus2lic "^(String.concat " " args.infiles)^" -n $n --gen-autotest &&\n\n"^
+           "$LUSTREV6 "^(String.concat " " args.infiles)^" -n $n --gen-autotest &&\n\n"^
              "# Now let's run ogensim \n" ^
-           "(ogensim.arm "^ogensim_exe^" -ul 1 \\\n\t-e $main_step"^
+           "($OGENSIM "^ogensim_exe^" -ul 1 \\\n\t-e $main_step"^
            " -cl $n.cycles -lp $freeport \\\n\t-iol $n.io > $n_n"^
              ".ogensim.log  2>&1&) && \n\nsleep 1 &&\n"^
            "(lurettetop -l 1000 -go -ns2c -o ogensim.rif \\\n\t \

utils/luciole-rif

 #!/bin/sh
-set -x #echo on
+# set -x #echo on
+
+TOOL=luciole-rif
 
 
 if [ "$#" -eq 0 ]; then
-    echo "usage: $0 [any sys call that reads/writes in RIF]
+    echo "usage: $TOOL [any sys call that reads/writes in RIF]
 examples:
-   $0 lutin -rif env.lut -n main
-   $0 lus2lic -rif controller.lus -n main 
+   $TOOL lutin -rif env.lut -n main
+   $TOOL lus2lic -rif controller.lus -n main 
     "
     exit 01
 fi