Some cleaning in the exemples directory

_oasis

 OASISFormat: 0.4
 Name:        Lutin
-Version:     2.50
+Version:     2.51
 Authors:     Erwan Jahier, Pascal Raymond, Bertrand Jeannnet (polka), Yvan Roux
 Maintainers: erwan.jahier@univ-grenoble-alpes.fr  
 License:     CeCILL

examples/Makefile

 
 # run all the non-regression tests
 
-# a faire coté lutin: luckyDraw, xlurette/Gyro, crazy-rabbit
-test-lucky: 
-	rm -f  */.lurette_rc */*/.lurette_rc */*/*/.lurette_rc
-	cd lucky/external_code && make test; 
-	cd lucky/other && make test ;
-	cd lucky/tut-examples/ && make test;
-	cd xlurette/Gyro && make test ;
-	cd xlurette/fault-tolerant-heater/ && make test ;
-	cd xlurette/heater/ && make test ;
-	cd luckyDraw/ocaml/ && make test ;
-	cd ocaml/xlurette && make test ;
-ifneq ($(HOST_TYPE),mac)
-#	cd xlurette/Sildex/ && make test ;
-	cd ocaml/crazy-rabbit/ && make test ;
-endif
-	((which rmlc && cd rml/ && make test) || true) ;
-ifeq ($(HOST_TYPE),sparc-sun)
-	cd xlurette/Scade-sparc && make test ;
-else 
-ifeq ($(HOST_TYPE),cygwin)
-	cd xlurette/Scade-win32 && make test ;
-else
-	echo "no scade for linux"
-endif
-endif
-	echo
-	echo "All lucky tests ran correctly."
-
-
-# test-fail:
-
-test-lutin:
-	cd lutin/up_and_down && make test;
+
+test:
+	cd up_and_down && make test;
 #	cd lutin/test_ok && make test;
-	cd lutin/lurettetop && make test;
-	cd lutin/call-luciole  && make test ;
-	cd lutin/ocaml && make test;
-	cd lutin/external_code && make test;
-	cd lutin/luciole && make test ;
-	cd lutin/crazy-rabbit && make test;
+	cd lurette_old && make test;
+	cd call-luciole  && make test ;
+	cd from_ocaml && make test;
+	cd external_code && make test;
+	cd luciole && make test ;
+	cd crazy-rabbit && make test;
 	echo "All lutin tests ran correctly."
 
 # XXX Broken !
@@ -49,6 +19,5 @@ test-lutin:
 
 # problem ~ 
 
-test:  test-lutin
 
 

examples/crazy-rabbit/README.org

+Make sure that caml code can be called from lurette.
+ 

examples/lutin/external_code/Makefile → examples/external_code/Makefile

@@ -75,7 +75,7 @@ $(OBJDIR)/bool_utils_au_plus_2_parmi_3.c : $(OBJDIR)/bool_utils_au_plus_2_parmi_
 
 
 ifndef LUTIN
-  LUTIN=../../../_build/lutin/src/main.native
+  LUTIN=../../_build/lutin/src/main.native
 endif
 
 run: $(OBJDIR)/$(MAIN).$(DLEXT) 

examples/external_code/README.org

+Test that makes sure that lutin is still able to call c code

examples/from_ocaml/README.org

+Test that make sure that lutin can be called from ocaml

examples/lutin/ocaml/call_foo.ml → examples/from_ocaml/call_foo.ml

@@ -11,7 +11,7 @@ open RdbgPlugin
 
 let _ = 
   let inputs, outputs, kill, step, step_dbg, mems_i,mems_o = 
-    let args = Array.of_list ["../../../bin/lutin";"foo.lut";"-n";"main";"-seed";"1"] in
+    let args = Array.of_list ["lutin";"foo.lut";"-n";"main";"-seed";"1"] in
     let plugin = LutinRun.make args in
     plugin.inputs,plugin.outputs,plugin.kill,plugin.step,plugin.step_dbg,
     plugin.init_inputs,plugin.init_outputs

examples/lutin/luciole/Makefile → examples/luciole/Makefile

 
 ifndef LUTIN
-  LUTIN=../../../_build/lutin/src/main.native
+  LUTIN=../../_build/lutin/src/main.native
 endif
 
 

examples/lutin/lurettetop/Makefile → examples/lurette_old/Makefile

@@ -109,18 +109,18 @@ utest: utest1 utest2 utest4
 test: test1 test2  test4 
 
 %.ec: %.lus
-	../../../bin/lus2lic$(EXE) -ec $^ -n $* -o $@
+	../../bin/lus2lic$(EXE) -ec $^ -n $* -o $@
 
 .PHONY:heater_control$(EXE)
 heater_control$(EXE): heater_control.ec 
-	../../../bin/ec2c$(EXE) -loop heater_control.ec 
+	../../bin/ec2c$(EXE) -loop heater_control.ec 
 	gcc heater_control.c heater_control_loop.c -o $@ 
 
 %.c: %.ec
-	../../../bin/ec2c$(EXE) -loop $^
+	../../bin/ec2c$(EXE) -loop $^
 
-LIB=-I ../../../lib graphics.cmxa ocaml2c.cmx ocamlRM.cmx -I +rdbg-plugin rdbg-plugin.cmxa
-XXX=-I ../../../source/obj-linux/
+LIB=-I ../../lib graphics.cmxa ocaml2c.cmx ocamlRM.cmx -I +rdbg-plugin rdbg-plugin.cmxa
+XXX=-I ../../source/obj-linux/
 
 # Essai pour appeler via des cmxs du code C généré par lus2c
 # Bon, ca semble ne pas marcher (au 4/11/2013)

examples/lurette_old/README.org

+Testing the old version of lurette (calling conventions changed)