lurette unstable.1 Mon, 11 Dec 2006 17:53:10 +0100 by jahier

Parent-Version:      1.43
Version-Log:         empty
Project-Description: Lurette

.lurette.prcs_aux

@@ -54,7 +54,7 @@
 (source/Makefile.luc4c 3146 1161778160 r/23_Makefile.l 1.1)
 (examples/xlurette/Scade-win32/pilot.saofdm 394 1137765987 l/31_pilot.saof 1.1)
 (source/sol_nb.mli 721 1099986649 i/16_sol_nb.mli 1.1)
-(examples/xlurette/Gyro/Makefile 534 1165588586 m/38_Makefile 1.1.2.1)
+(examples/xlurette/Gyro/Makefile 541 1165855990 m/38_Makefile 1.1.2.2)
 (source/gen_stubs_common.ml 21431 1149596800 e/39_gen_stubs_ 1.8)
 (examples/xlurette/Scade-win32/position_validation.saofd 10188 1137765987 l/37_position_v 1.1)
 (source/luckyCapi_stubs.c 10834 1137765987 n/38_luckyCapi_ 1.1)
@@ -62,7 +62,7 @@
 (doc/figs/lurette.fig 1583 1138034376 q/44_lurette.fi 1.1)
 (examples/xlurette/Sildex/oracle_sildex_io.c 0 1138025047 o/27_oracle_sil 1.1)
 (examples/ocaml/crazy-rabbit/rabbit-dir.luc 1458 1137765987 j/49_rabbit-dir 1.1)
-(examples/luckyDraw/c/Makefile 2270 1165588586 l/4_Makefile 1.3)
+(examples/luckyDraw/c/Makefile 2281 1165855990 l/4_Makefile 1.4)
 (examples/xlurette/Scade-sparc/Direction_D1/definitions.h 787 1137765987 l/23_definition 1.1)
 (source/bddd.ml 20088 1137765987 g/36_bddd.ml 1.14)
 (source/gen_lustre_calling_C_code.ml 2992 1122044801 i/50_gen_lustre 1.1)
@@ -90,7 +90,7 @@
 (install/pixmaps/quit.xpm 494 1137765987 n/18_quit.xpm 1.1)
 (examples/luckyDraw/ocaml/draw-ex.ml 3137 1165588586 l/8_draw-ex.ml 1.2)
 (examples/xlurette/heater/buggy_heater_ctrl.lus 219 1137765987 m/10_buggy_heat 1.1)
-(Makefile 575 1165588586 d/13_Makefile 1.12)
+(Makefile 637 1165855990 d/13_Makefile 1.13)
 (xlurette/Scade/Images/lurun.bmp 822 1122044801 i/22_lurun.bmp 1.1)
 (examples/xlurette/heater/temp_float.luc 704 1137765987 m/9_temp_float 1.1)
 (install/pixmaps/config-params.xpm 2753 1137765987 n/12_config-par 1.1)
@@ -112,7 +112,7 @@
 (utils/lucky_cpp 230 1137765987 n/29_lucky_cpp 1.1)
 (source/liblutin_c.c 8384 1165588586 j/20_liblutin_c 1.1.2.1)
 (source/Ezdl.mli 4044 1127735479 j/18_Ezdl.mli 1.1)
-(examples/lucky/other/Makefile 1494 1137765987 k/47_Makefile 1.1)
+(examples/lucky/other/Makefile 1554 1165855990 k/47_Makefile 1.2)
 (examples/xlurette/Scade-win32/Pilot.saofd 3645 1137765987 l/46_Pilot.saof 1.1)
 (source/value.ml 2681 1078751438 c/23_value.ml 1.9)
 (examples/xlurette/Scade-win32/det_mvt_mode_cstext.c 703 1137765987 l/42_det_mvt_mo 1.1)
@@ -125,9 +125,9 @@
 (doc/figs/nh-gen-pict.fig 3181 1138034376 q/43_nh-gen-pic 1.1)
 (examples/lucky/tut-examples/simple.luc 174 1137765987 k/27_simple.luc 1.1)
 (doc/figs/nh-lurette-start.fig 2042 1138034376 q/49_nh-lurette 1.1)
-(examples/rml/Makefile 742 1137765987 k/13_Makefile 1.1)
+(examples/rml/Makefile 744 1165855990 k/13_Makefile 1.1.1.1)
 (source/solver.mli 1793 1137765987 38_solver.mli 1.25)
-(examples/xlurette/heater/Makefile 1798 1137765987 m/18_Makefile 1.1)
+(examples/xlurette/heater/Makefile 1812 1165855990 m/18_Makefile 1.2)
 (xlurette/Scade/tcldemo.def 38 1122044801 j/10_tcldemo.de 1.1)
 (README-luc4ocaml 1304 1137765987 j/37_README-luc 1.1)
 (examples/xlurette/Sildex/Makefile 754 1138025047 o/29_Makefile 1.1)
@@ -158,7 +158,7 @@
 (polka/C/satmat.c 6254 1047029868 e/4_satmat.c 1.1)
 (install/pixmaps/lugenor.bmp 822 1137765987 n/0_lugenor.bm 1.1)
 (polka/C/satmat.h 1254 1047029868 d/48_satmat.h 1.1)
-(source/luc4ocaml.mli 1930 1137765987 i/31_lucaml.mli 1.2)
+(source/luc4ocaml.mli 2002 1165855990 i/31_lucaml.mli 1.3)
 (xlurette/xlurette.glade 115318 1138032075 q/22_xlurette.g 1.1)
 (source/print.ml 5822 1078751438 47_print.ml 1.27)
 (source/parse_poc.mli 1131 1078751438 d/29_parse_poc. 1.5)
@@ -278,7 +278,7 @@
 (install/pixmaps/env.bmp 2042754 1137765987 m/45_env.bmp 1.1)
 (examples/xlurette/Scade-win32/Control.saofd 6690 1137765987 l/51_Control.sa 1.1)
 (source/luc4c_caml.ml 712 1149596800 r/14_luc4c_caml 1.1)
-(source/luckyDraw.mli 5036 1165588586 i/36_luckyDraw. 1.3.1.1)
+(source/luckyDraw.mli 5107 1165855990 i/36_luckyDraw. 1.3.1.2)
 (examples/lucky/tut-examples/simpler.luc 167 1137765987 k/26_simpler.lu 1.1)
 (i386-linux-gcc3/bin/sim2chrogtk 784763 1138032075 q/15_sim2chrogt 1.1)
 (install/pixmaps/batch.xpm 456 1137765987 n/13_batch.xpm 1.1)
@@ -308,7 +308,7 @@
 (install/Makefile.lurette.in 5158 1137765987 b/38_Makefile.l 1.38)
 (examples/rml/window.out.exp 2210 1137765987 k/6_window.out 1.1)
 (examples/xlurette/heater/test1.res 0 1137765987 m/22_test1.res 1.1)
-(source/version.ml 27 1165507939 n/43_version.ml 1.5)
+(source/version.ml 15 1165855990 n/43_version.ml 1.6)
 (examples/xlurette/Scade-win32/Pilot.ewo 785 1137765987 l/28_Pilot.ewo 1.1)
 (RELEASE-NOTES 3737 1165588586 h/45_RELEASE-NO 1.7.1.1)
 (examples/lucky/C/test.res 0 1149596800 r/18_test.res 1.1)
@@ -320,7 +320,7 @@
 (source/luc_exe.mli 436 1080290901 b/31_ima_exe.ml 1.5)
 (source/ne.mli 2319 1127735479 c/22_ne.mli 1.11)
 (examples/xlurette/Scade-win32/Pilot.vsp 2075 1137765987 l/45_Pilot.vsp 1.1)
-(examples/lucky/lustre/Makefile 1660 1165507939 r/25_Makefile 1.1)
+(examples/lucky/lustre/Makefile 1664 1165855990 r/25_Makefile 1.2)
 (source/luc2c.ml 18086 1165507939 n/46_luc2c.ml 1.5)
 (install/pixmaps/config-params.bmp 6966 1137765987 m/47_config-par 1.1)
 (source/gen_stubs.ml 14674 1137765987 24_generate_l 1.63)
@@ -329,7 +329,7 @@
 (source/gen_stubs_sildex.ml 9755 1122044801 h/38_gen_stubs_ 1.5)
 (source/gen_stubs_scade.mli 793 1122044801 f/6_gen_stubs_ 1.4)
 (source/luc4c.mli 3003 1149596800 r/15_luc4c.mli 1.1)
-(source/Makefile 21596 1165588586 c/20_Makefile 1.49)
+(source/Makefile 21758 1165855990 c/20_Makefile 1.50)
 (examples/xlurette/heater/test1.rif 1074 1137765987 m/20_test1.rif 1.1)
 (examples/xlurette/Scade-win32/Pilot.vsw 431 1137765987 l/44_Pilot.vsw 1.1)
 (examples/xlurette/Scade-win32/MyConsts.saofd 153 1137765987 l/48_MyConsts.s 1.1)
@@ -360,9 +360,9 @@
 (examples/lucky/tut-examples/test.rif 667 1137765987 k/24_test.rif 1.1)
 (source/rif.ml 7464 1122044801 h/27_rif.ml 1.4)
 (doc/tutorial/simple.tex 267 1138032075 q/26_simple.tex 1.1)
-(examples/xlurette/tram/Makefile 1283 1165588586 o/19_Makefile 1.1.1.1)
-(examples/xlurette/fault-tolerant-heater/Makefile 827 1165588586 n/47_Makefile 1.1.1.1)
-(source/Makefile.release 13685 1165588586 n/41_Makefile.r 1.7)
+(examples/xlurette/tram/Makefile 1300 1165855990 o/19_Makefile 1.1.1.2)
+(examples/xlurette/fault-tolerant-heater/Makefile 848 1165855990 n/47_Makefile 1.1.1.2)
+(source/Makefile.release 14013 1165855990 n/41_Makefile.r 1.8)
 (source/socket_client_serveur.ml 1844 1122044801 i/42_socket_cli 1.1)
 (xlurette/Scade/LuretteTcl.c 752 1122044801 j/15_LuretteTcl 1.1)
 (source/Makefile.lutinlib 1691 1138025047 n/44_Makefile.l 1.1)
@@ -429,7 +429,7 @@
 (polka/Makefile.config 2289 1138025047 e/20_Makefile.c 1.10)
 (examples/xlurette/Scade-sparc/exo1.vsw 400 1137765987 l/16_exo1.vsw 1.1)
 (examples/xlurette/fault-tolerant-heater/degradable-sensors.luc 1382 1137765987 h/15_wearing-se 1.3)
-(examples/lucky/external_code/Makefile 1169 1137765987 j/24_Makefile 1.2)
+(examples/lucky/external_code/Makefile 1182 1165855990 j/24_Makefile 1.3)
 (examples/xlurette/Scade-sparc/libpwlinear.saofdm 1379 1137765987 l/12_libpwlinea 1.1)
 (examples/xlurette/Scade-sparc/Direction_D1/Direction_D1.c 935 1137765987 l/25_Direction_ 1.1)
 (source/sut.ml 2317 1083336219 h/29_sut.ml 1.2)
@@ -573,7 +573,7 @@
 (doc/lurette-man/heater_control.tex 2712 1138032075 q/10_heater_con 1.1)
 (doc/lurette-man/macros.tex 5209 1138032075 q/7_macros.tex 1.1)
 (examples/lucky/other/test1.res 0 1137765987 k/43_test1.res 1.1)
-(examples/luckyDraw/ocaml/Makefile 562 1138025047 l/9_Makefile 1.2)
+(examples/luckyDraw/ocaml/Makefile 581 1165855990 l/9_Makefile 1.3)
 (polka/C/matrix.h 3846 1071844798 d/51_matrix.h 1.2)
 (doc/tutorial/intro-lucky.tex 5319 1138032075 q/29_intro-luck 1.1)
 (install/pixmaps/run.bmp 726 1137765987 m/43_run.bmp 1.1)

Makefile

@@ -22,6 +22,10 @@ ci:
 	prcs checkin lurette.prj
 	make gen_version
 
+lci:
+	prcs checkin -r unstable lurette.prj
+	make gen_version
+
 touch:
 	cd test && make touch
 

examples/lucky/external_code/Makefile

@@ -54,7 +54,7 @@ utest:
 	cp test.rif test.rif.exp
 
 clean:
-	rm -rf $(OBJDIR)
+	rm -rf $(OBJDIR) *.rif *.rif0
 
 
 

examples/lucky/lustre/Makefile

@@ -57,9 +57,9 @@ foo: foo.o call_foo.o call_foo_ext_func.o call_foo_loop.o
 ################################################################
 
 clean:
-	rm -f run *.o *~  call_foo_ext* call_foo.c call_foo.h call_foo_loop.c call_foo_loop.h foo.h foo.c *.gp *.plot *.rif *.ec foo
+	rm -f run *.o *~  call_foo_ext* call_foo.c call_foo.h call_foo_loop.c call_foo_loop.h foo.h foo.c *.gp *.plot *.rif *.ec foo #*
 
-test : foo
+test : foo 
 ifeq ($(HOST_TYPE),win32)
 	foo$(EXE) 
 else

examples/lucky/other/Makefile

@@ -43,6 +43,7 @@ test5 :
 	$(LUCKY) -l 10 \
 	bj.luc | sed -e "s/^M//"  | grep -v "This is Lucky Version"  > test5.rif
 	rm -f test5.res && diff -u -i  test5.rif$(EXP) test5.rif   > test5.res 
+	[ ! -s test5.res ] && make clean 
 
 
 test : test1 test2 test3 test4 test5
@@ -64,7 +65,7 @@ utest4:
 utest: utest1 utest2 utest3 utest4
 
 clean:
-	rm -rf $(OBJDIR) rm -rf *.log *~
+	rm -rf $(OBJDIR) rm -rf *.log *~ *.rif0 *.rif *.gp *.plot
 
 
 

examples/luckyDraw/c/Makefile

@@ -92,4 +92,6 @@ luckyDrawC_stubs.c: luckyDrawC_stubs.c.m4
 # cleaning
 #---------------------------------------
  clean:
-	/bin/rm -f *.cmi *.cmo *.cmx *.o luckyDrawC_stubs.c
+	/bin/rm -f *.cmi *.cmo *.cmx *.o luckyDrawC_stubs.c *~ essai
+
+

examples/luckyDraw/ocaml/Makefile

@@ -20,4 +20,4 @@ make utest:
 
 
 clean:
-	- rm -f $(MAIN) *.cmx *.cmi *.cmo *.o
+	- rm -f $(MAIN) *.cmx *.cmi *.cmo *.o *.plot *.gp *.data

examples/rml/Makefile

@@ -31,7 +31,7 @@ make utest:
 	cp window.out window.out.exp
 
 clean:
-	- rm -f window.ml  *.rannot *.rzi *.cmx *.cmi *.o *~
+	rm -f window.ml  *.rannot *.rzi *.cmx *.cmi *.cmo *.o *~
 
 real_clean: clean
-	- rm  window
\ No newline at end of file
+	rm  window
\ No newline at end of file

examples/xlurette/Gyro/Makefile

@@ -21,7 +21,7 @@ utest:
 
 
 clean:
-	rm -rf *.ec *.log *~ *.o Data *.pp_luc
+	rm -rf *.ec *.log *~ *.o Data *.pp_luc *.rif0
 
 
 

examples/xlurette/fault-tolerant-heater/Makefile

@@ -24,7 +24,7 @@ utest:
 
 
 clean:
-	rm -rf *.ec *.log *~ *.o *rif0 Data *.pp_luc
+	rm -rf *.ec *.log *~ .*~ *.o *rif0 *rif Data *.pp_luc *.plot *.gp
 
 
 

examples/xlurette/heater/Makefile

@@ -46,7 +46,7 @@ test3 :
 	[ ! -s test3.res ] && make clean 
 
 
-test : test1 test2 test3
+test : test1 test2 test3 
 
 utest1:
 	cp test1.rif test1.rif.exp
@@ -60,7 +60,7 @@ utest3:
 utest: utest1 utest2 utest3
 
 clean:
-	$(RM) -rf *.ec *.log *~ Data *.pp_luc
+	$(RM) -rf *.ec *.log *~ Data *.pp_luc *.rif0 *.rif
 
 
 

examples/xlurette/tram/Makefile

@@ -45,7 +45,7 @@ utest2:
 utest: utest1 utest2
 
 clean:
-	rm -rf *.ec *.log *~ Data *.pp_luc
+	rm -rf *.ec *.log *~ Data *.pp_luc *.~ *.rif *.rif0
 
 
 

source/Makefile

@@ -521,6 +521,8 @@ luc2c_assert:
 	make -k nc -f Makefile.luc2c OCAMLFLAGS=""
 	cp luc2c_exe luc2c_exe_assert
 
+
+
 ##############################################################################"
 luc4c:
 	make -k ncl -f Makefile.luc4c OCAMLFLAGS="-noassert -unsafe"
@@ -536,6 +538,10 @@ luc4c_debug:
 luc4c_assert:
 	make -k ncl -f Makefile.luc4c OCAMLFLAGS=""
 
+luc4c-doc:
+	ocamldoc -t "Luc4c interface" -pp "camlp4o" \
+	-html  -d $(SYNCHRONE_DIR)/lurette/doc/luc4c/ \
+	 -I ocamldoc -I .. luc4c.mli
 
 ##############################################################################"
 gen_lustre:
@@ -590,7 +596,7 @@ lurette-man:
 tutorial:
 	cd ../doc/tutorial && make all 
 
-all-doc: lucky-man lurette-man tutorial
+all-doc: lucky-man lurette-man tutorial draw-doc luc4ocaml-doc
 
 
 ##############################################################################"

source/Makefile.release

@@ -265,7 +265,10 @@ luc4ocaml-rel:
 	mkdir /tmp/$(LUC4OCAML_RELEASE_NAME)/doc
 	\
 	cp ../README-luc4ocaml /tmp/$(LUC4OCAML_RELEASE_NAME)/
+	cp ../$(HOSTTYPE)/bin/luc2c /tmp/$(LUC4OCAML_RELEASE_NAME)/bin
+	cp ../$(HOSTTYPE)/bin/luc2c_exe /tmp/$(LUC4OCAML_RELEASE_NAME)/bin
 	cp ../$(HOSTTYPE)/lib/liblucky_nc.a /tmp/$(LUC4OCAML_RELEASE_NAME)/lib
+	cp ../$(HOSTTYPE)/lib/libluc4c_nc.a /tmp/$(LUC4OCAML_RELEASE_NAME)/lib
 	cp ../$(HOSTTYPE)/lib/*luc4ocaml*.* /tmp/$(LUC4OCAML_RELEASE_NAME)/lib
 	\
 	cp -rf $(HOME)/$(HOSTTYPE)/lib/*polka*a /tmp/$(LUC4OCAML_RELEASE_NAME)/lib
@@ -297,6 +300,10 @@ test-luc4ocaml-rel:
 
 ALL_RELEASE_NAME=luretteToolSuite_$(VERSION)_$(HOSTTYPE32)+ocaml-`ocamlc -v | grep version | cut -d " " -f6`
 
+cleanup:
+	cd .. ; rm -f *~ ; rm -f */*~; rm -f */*/*~; rm -f */*/*/*~; rm -f */*/*/*/*~
+
+
 all-rel: lurette-rel lucky-rel draw-rel luc4ocaml-rel
 	rm -rf /tmp/$(ALL_RELEASE_NAME)
 	mkdir /tmp/$(ALL_RELEASE_NAME)
@@ -319,8 +326,10 @@ test-all-rel:
 
 
 #################################################################################################"
-# install the new version at verimag, and test it*
+# install the new version at verimag, and test it
+
 
+# Faire un make all-rel avant ...
 verimag:
 	cp $(SYNCHRONE_DIR)/lurette/$(ALL_RELEASE_NAME).tgz /usr/local/tools/lustre-misc && \
 	cd /usr/local/tools/lustre-misc && \

source/luc4ocaml.mli

+(** Time-stamp: <modified the 11/12/2006 (at 15:27) by Erwan Jahier> *)
 (*-----------------------------------------------------------------------
 ** Copyright (C) - Verimag.
 ** This file may only be copied under the terms of the GNU Library General

source/luckyDraw.mli

+(** Time-stamp: <modified the 11/12/2006 (at 15:25) by Erwan Jahier> *)
 (*
  ** File: luckyDraw.mli
  ** Author: jahier@imag.fr
  *)
 
 (**
+
   LuckyDraw is a Boolean and numeric solver and drawer.
 
   The Boolean part is based on BDDS and the numeric part
@@ -16,7 +18,7 @@
   
   [ List.iter print_solution 
   (draw (solve (make_bool_expr ["x",Bool; "y",Bool; "Z",Bool] "true"))) ;;]
-  
+
 *)
 
 

source/version.ml

-let str="unstable_1_43.10"
+let str="1.43"