Commit 4be4c2b2 authored by Erwan Jahier's avatar Erwan Jahier

lurette unstable.5 Mon, 03 Dec 2007 17:43:18 +0100 by jahier

Parent-Version:      unstable.4
Version-Log:         empty
Project-Description: Lurette
parent 29377b85
......@@ -13,7 +13,7 @@
(install/pixmaps/gnuplot.bmp 822 1137765987 n/2_gnuplot.bm 1.1)
(examples/xlurette/Sildex/oracle_sildex.c 11793 1138025047 o/28_oracle_sil 1.1)
(examples/lucky/other/structured_type.luc 2289 1137765987 k/50_structured 1.1)
(examples/luckyDraw/ocaml/draw-ex.out 499 1172658530 l/6_draw-ex.ou 1.3)
(examples/luckyDraw/ocaml/draw-ex.out 472 1196700198 l/6_draw-ex.ou 1.4)
(xlurette/Scade/GenMake_l4sim.tcl 21042 1165588586 j/16_GenMake_l4 1.2.1.1)
(examples/lucky/tut-solution/Makefile 315 1137765987 k/17_Makefile 1.1)
(examples/xlurette/Sildex/oracle_sildex.h 1516 1138025047 o/26_oracle_sil 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 2635 1172658530 l/4_Makefile 1.6)
(examples/luckyDraw/c/Makefile 2635 1196700198 l/4_Makefile 1.7)
(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)
......@@ -70,12 +70,12 @@
(source/liblutin.idl 181 1127735479 j/21_liblutin.i 1.1)
(doc/lurette-man/sensors.tex 846 1138032075 q/5_sensors.te 1.1)
(test/time-CHAILLOL.res 8235 1063029729 g/11_time-CHAIL 1.1)
(source/parse_luc.ml 51759 1172658530 41_parse_env. 1.71)
(source/parse_luc.ml 51761 1196700198 41_parse_env. 1.72)
(source/lurette_exe.c 373 1169542477 e/27_lurette_ex 1.3.1.2)
(source/show_luc.ml 4332 1137765987 e/25_show_luc.m 1.13)
(examples/xlurette/Scade-sparc/Direction_D1.saofd 1335 1137765987 l/21_Direction_ 1.1)
(install/xlurette.sh.in 99 1172658530 g/21_xlurette.s 1.4)
(source/lurettetop.ml 84864 1169542477 c/1_lurettetop 1.63.2.2)
(source/lurettetop.ml 84932 1196700198 c/1_lurettetop 1.63.2.3)
(examples/xlurette/Sildex/sut_sildex.c 10531 1138025047 o/23_sut_sildex 1.1)
(polka/Changes 1952 1071844798 e/22_Changes 1.2)
(examples/xlurette/Sildex/sut_sildex_io.c 0 1138025047 o/21_sut_sildex 1.1)
......@@ -106,7 +106,7 @@
(install/xlurette.bat.in 62 1172658530 g/22_xlurette.b 1.4)
(test/time-ecrins.res 10644 1137765987 d/20_time-ecrin 1.51)
(examples/lucky/tut-examples/Makefile 611 1137765987 k/25_Makefile 1.1)
(user-rules 25341 1149596800 c/14_myrules 1.77)
(user-rules 25258 1196700198 c/14_myrules 1.78)
(examples/xlurette/Scade-win32/counter.saofd 587 1137765987 l/40_counter.sa 1.1)
(polka/caml/polka_caml.h 1648 1071844798 d/36_polka_caml 1.2)
(utils/lucky_cpp 284 1172658530 n/29_lucky_cpp 1.2)
......@@ -128,13 +128,13 @@
(examples/lucky/tut-examples/simple.luc 174 1137765987 k/27_simple.luc 1.1)
(GBDDML/OCamlMakefile 21208 1170322322 r/37_OCamlMakef 1.1)
(doc/figs/nh-lurette-start.fig 2042 1138034376 q/49_nh-lurette 1.1)
(examples/rml/Makefile 764 1169542477 k/13_Makefile 1.1.1.2)
(examples/rml/Makefile 754 1196700198 k/13_Makefile 1.1.1.3)
(source/solver.mli 1793 1137765987 38_solver.mli 1.25)
(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)
(examples/xlurette/fault-tolerant-heater/sensors.luc 638 1137765987 h/18_sensors.lu 1.3)
(examples/xlurette/Sildex/Makefile 757 1196700198 o/29_Makefile 1.2)
(examples/xlurette/fault-tolerant-heater/sensors.luc 639 1196700198 h/18_sensors.lu 1.4)
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
(source/Makefile.lurettetop 586 1137765987 d/14_Makefile.l 1.9)
(doc/figs/thick.fig 1793 1138034376 q/37_thick.fig 1.1)
......@@ -142,12 +142,12 @@
(examples/ocaml/crazy-rabbit/rabbit-dir-line.luc 937 1137765987 j/46_rabbit-dir 1.1)
(utils/rif.el 1780 1137765987 j/34_rif.el 1.1)
(source/luckyDraw.ml 12835 1165588586 i/37_luckyDraw. 1.3.1.1)
(examples/rml/window.rml 1456 1137765987 k/8_window.rml 1.1)
(examples/rml/window.rml 1455 1196700198 k/8_window.rml 1.2)
(examples/xlurette/heater/heater_ctrl.lus 175 1137765987 m/6_heater_ctr 1.1)
(install/pixmaps/myrun.bmp 44098 1137765987 m/44_myrun.bmp 1.1)
(doc/lurette-man/lurette-man.tex 39569 1137765987 h/33_lurette-ma 1.4)
(source/env_state.ml 21854 1137765987 51_env_state. 1.64)
(lnsw 2167 1172658530 q/35_lnsw 1.2)
(source/env_state.ml 23474 1196700198 51_env_state. 1.65)
(lnsw 2813 1196700198 q/35_lnsw 1.3)
(doc/ocamldoc.sty 1720 1071235286 b/12_ocamldoc.s 1.3)
(examples/xlurette/heater/temp_int.luc 759 1137765987 m/7_temp_int.l 1.1)
(examples/xlurette/heater/heater_ctrl2.lus 182 1137765987 m/21_heater_ctr 1.1)
......@@ -177,7 +177,7 @@
(GBDDML/bdd.mli.hide 1654 1170322322 r/35_bdd.mli.hi 1.1)
(examples/xlurette/Scade-win32/lib_pilot.vsw 435 1137765987 l/32_lib_pilot. 1.1)
(source/gnuplot-socket.ml 1773 1137765987 i/18_gnuplot-so 1.3)
(source/Makefile.lucky 4874 1172658530 b/41_Makefile.i 1.39.1.2)
(source/Makefile.lucky 4858 1196700198 b/41_Makefile.i 1.39.1.3)
(examples/lucky/other/time-joly.res 789 1137765987 k/31_time-joly. 1.1)
(examples/lucky/lustre/test.rif.exp 200 1165507939 r/26_test.rif.e 1.1)
(source/lurette.plot 684 1137765987 n/37_lurette.pl 1.1)
......@@ -186,9 +186,9 @@
(source/constraint.ml 3343 1137765987 c/19_constraint 1.14)
(examples/xlurette/Scade-sparc/Makefile 552 1137765987 l/10_Makefile 1.1)
(polka/caml/polka_lexer.mli 200 1047029868 d/41_polka_lexe 1.1)
(source/solver.ml 11994 1169542477 39_solver.ml 1.67)
(source/solver.ml 12630 1196700198 39_solver.ml 1.68)
(GBDDML/.test.ml.swp 12288 1170322322 r/40_.test.ml.s 1.1)
(examples/ocaml/crazy-rabbit/rabbit-dir-obstacle.luc 1849 1137765987 j/48_rabbit-dir 1.1)
(examples/ocaml/crazy-rabbit/rabbit-dir-obstacle.luc 1948 1196700198 j/48_rabbit-dir 1.2)
(examples/xlurette/Gyro/giro.luc 2445 1137765987 m/33_giro.luc 1.1)
(examples/lucky/tut-examples/fairness.luc 281 1137765987 k/30_fairness.l 1.1)
(polka/caml/polka_lexer.mll 798 1165588586 d/42_polka_lexe 1.2.2.1)
......@@ -199,7 +199,7 @@
(source/type.mli 756 1149596800 h/11_type.mli 1.4)
(examples/xlurette/Scade-win32/telemetry_validation.saofd 4738 1137765987 l/30_telemetry_ 1.1)
(GBDDML/Makefile.R1 1031 1170322322 r/39_Makefile.R 1.1)
(install/set_env_var.in 1684 1172658530 g/23_set_env_va 1.9.2.2)
(install/set_env_var.in 1686 1196700198 g/23_set_env_va 1.9.2.3)
(examples/xlurette/Scade-win32/C_SQRT.saofd 214 1137765987 m/2_C_SQRT.sao 1.1)
(examples/ocaml/crazy-rabbit/crazy_rabbit-rabbit_speed.luc 3547 1137765987 j/41_crazy_rabb 1.1)
(examples/ocaml/crazy-rabbit/up_and_down_macro 408 1137765987 k/5_up_and_dow 1.1)
......@@ -210,7 +210,7 @@
(install/pixmaps/lupref.bmp 822 1137765987 m/51_lupref.bmp 1.1)
(i386-linux-gcc3/include/signal4.h 6995 1138025047 o/32_signal4.h 1.1)
(source/formula_to_bdd.mli 1358 1137765987 g/35_formula_to 1.9)
(install/configure.in 9456 1172658530 d/11_configure. 1.27)
(install/configure.in 10435 1196700198 d/11_configure. 1.28)
(examples/xlurette/Scade-win32/Command.saofd 4147 1137765987 m/1_Command.sa 1.1)
(examples/xlurette/fault-tolerant-heater/heater_control_env.luc 485 1137765987 h/16_heater_con 1.4)
(doc/lurette-man/fault-tolerant-tut.tex 15451 1138032075 q/11_fault-tole 1.1)
......@@ -293,7 +293,7 @@
(examples/lucky/other/test2.rif.exp 400 1137765987 k/38_test2.rif. 1.1)
(source/formula_to_bdd.ml 22536 1137765987 g/34_formula_to 1.13)
(source/Makefile.lurette_ocaml_lib 2978 1137765987 j/1_Makefile.l 1.2)
(examples/ocaml/crazy-rabbit/rabbit.ml 8717 1165507939 k/4_rabbit.ml 1.2)
(examples/ocaml/crazy-rabbit/rabbit.ml 8853 1196700198 k/4_rabbit.ml 1.3)
(doc/figs/heater_sensors.fig 2392 1138034376 r/4_heater_sen 1.1)
(examples/ocaml/crazy-rabbit/rabbit.out.exp 31899 1137765987 j/50_rabbit.out 1.1)
(examples/xlurette/Gyro/onlyroll.batch 381 1137765987 m/32_onlyroll.b 1.1)
......@@ -311,7 +311,7 @@
(GBDDML/Makefile 3166 1172658530 r/30_Makefile 1.2)
(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 21 1172658530 n/43_version.ml 1.9)
(source/version.ml 21 1196700198 n/43_version.ml 1.10)
(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)
......@@ -323,8 +323,8 @@
(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 1172658530 r/25_Makefile 1.4)
(source/luc2c.ml 18725 1172658530 n/46_luc2c.ml 1.6)
(examples/lucky/lustre/Makefile 1642 1196700198 r/25_Makefile 1.5)
(source/luc2c.ml 19134 1196700198 n/46_luc2c.ml 1.7)
(install/pixmaps/config-params.bmp 6966 1137765987 m/47_config-par 1.1)
(source/gen_stubs.ml 14674 1137765987 24_generate_l 1.63)
(examples/lucky/C/foo.luc 199 1149596800 r/19_foo.luc 1.1)
......@@ -332,7 +332,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 22198 1172658530 c/20_Makefile 1.52)
(source/Makefile 21985 1196700198 c/20_Makefile 1.53)
(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)
(examples/xlurette/Scade-win32/Direction_D1.saofd 1298 1137765987 m/3_Direction_ 1.1)
......@@ -341,7 +341,7 @@
(source/control.mli 3187 1078751438 c/3_control.ml 1.4)
(test/time-asti.exp 3594 1137765987 h/41_time-asti. 1.10)
(source/Makefile.lucky2lus 1440 1138025047 j/7_Makefile.l 1.3)
(examples/lucky/external_code/foo.c 391 1127735479 j/22_foo.c 1.1)
(examples/lucky/external_code/foo.c 539 1196700198 j/22_foo.c 1.2)
(xlurette/Scade/lucky.ini 2593 1122044801 i/20_lucky.ini 1.1)
(examples/xlurette/Scade-win32/det_mvt_mode.saofd 4184 1137765987 l/38_det_mvt_mo 1.1)
(source/control.ml 4549 1078751438 c/4_control.ml 1.6)
......@@ -351,16 +351,16 @@
(examples/luckyDraw/ocaml/draw-ex.out.exp 472 1165477648 l/5_draw-ex.ou 1.2)
(source/lustreExp.mli 2372 1137765987 g/46_lustreExp. 1.12)
(i386-linux-gcc3/bin/lus2ec 677 1138032075 q/17_lus2ec 1.1)
(utils/luckytolatex 1600 1137765987 n/30_luckytolat 1.1)
(utils/luckytolatex 1517 1196700198 n/30_luckytolat 1.2)
(install/pixmaps/open.xpm 782 1137765987 n/20_open.xpm 1.1)
(utils/lucky.vim 1861 1090330182 h/44_lucky.vim 1.1)
(examples/ocaml/crazy-rabbit/test.res 0 1137765987 k/2_test.res 1.1)
(polka/documentation/texinfo.tex 200195 1047029868 e/16_texinfo.te 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 1308 1172658530 o/19_Makefile 1.1.1.3)
(examples/xlurette/fault-tolerant-heater/Makefile 848 1165855990 n/47_Makefile 1.1.1.2)
(source/Makefile.release 14155 1172658530 n/41_Makefile.r 1.10)
(examples/xlurette/tram/Makefile 1311 1196700198 o/19_Makefile 1.1.1.4)
(examples/xlurette/fault-tolerant-heater/Makefile 864 1196700198 n/47_Makefile 1.1.1.3)
(source/Makefile.release 14325 1196700198 n/41_Makefile.r 1.11)
(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)
......@@ -377,7 +377,7 @@
(i386-linux-gcc3/include/config.h 506 1138025047 o/34_config.h 1.1)
(polka/C/polka.c 5608 1071844798 e/6_polka.c 1.2)
(doc/figs/lurette-start.fig 1604 1138034376 q/47_lurette-st 1.1)
(polka/Makefile 1646 1076684617 e/21_Makefile 1.2)
(polka/Makefile 1648 1196700198 e/21_Makefile 1.3)
(polka/README 1437 1047029868 e/19_README 1.1)
(polka/C/polka.h 1791 1071844798 d/50_polka.h 1.2)
(polka/C/Makefile 7763 1165588586 e/15_Makefile 1.3)
......@@ -419,10 +419,10 @@
(source/lutin_caml.mli 3222 1122044801 i/35_lutin_caml 1.1)
(examples/lucky/other/losange-3d.luc 570 1137765987 k/46_losange-3d 1.1)
(examples/lucky/other/test1.rif.exp 33449 1137765987 k/41_test1.rif. 1.1)
(polka/Makefile.config 2472 1172658530 e/20_Makefile.c 1.10.1.1)
(polka/Makefile.config 2427 1196700198 e/20_Makefile.c 1.10.1.2)
(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 1494 1172658530 j/24_Makefile 1.4)
(examples/lucky/external_code/Makefile 1677 1196700198 j/24_Makefile 1.5)
(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)
......@@ -432,7 +432,7 @@
(source/gen_stubs_common.mli 2547 1122044801 e/40_gen_stubs_ 1.5)
(examples/ocaml/crazy-rabbit/moving-obstacle.luc 1605 1137765987 j/45_moving-obs 1.1)
(TAGS 9825 1007379917 21_TAGS 1.6)
(examples/ocaml/crazy-rabbit/Makefile 2144 1172658530 k/3_Makefile 1.3)
(examples/ocaml/crazy-rabbit/Makefile 2314 1196700198 k/3_Makefile 1.4)
(examples/xlurette/Scade-sparc/Direction_D1/Direction_D1.h 835 1137765987 l/24_Direction_ 1.1)
(examples/xlurette/Scade-sparc/libmathadvanced.saofdm 3267 1137765987 l/13_libmathadv 1.1)
(examples/ocaml/crazy-rabbit/crazy_rabbit-rabbit_dir.luc 3474 1137765987 j/40_crazy_rabb 1.1)
......@@ -491,7 +491,7 @@
(examples/lucky/C/call_foo.c 777 1149596800 r/20_call_foo.c 1.1)
(source/luc4c_stubs.c 6726 1172658530 r/13_luc4c_stub 1.4)
(doc/figs/logo-ist.pdf 5433 1138034376 q/51_logo-ist.p 1.1)
(xlurette/xlurette_glade_main.ml 73731 1138032075 q/23_xlurette_g 1.1)
(xlurette/xlurette_glade_main.ml 73768 1196700198 q/23_xlurette_g 1.2)
(source/util2.ml 7738 1137765987 n/35_util2.ml 1.1)
(examples/lucky/other/infinite_weight.luc 1116 1137765987 k/49_infinite_w 1.1)
(install/lurettetop.sh.in 148 1172658530 g/25_lurettetop 1.5)
......@@ -507,11 +507,11 @@
(doc/tutorial/heater_control_env.tex 432 1138032075 q/30_heater_con 1.1)
(doc/lurette-man/Makefile 1497 1165588586 q/14_Makefile 1.2)
(install/pixmaps/open.ppm 1741 1137765987 n/6_open.ppm 1.1)
(source/exp.ml 10797 1137765987 g/47_exp.ml 1.13)
(source/exp.ml 10878 1196700198 g/47_exp.ml 1.14)
(GBDDML/gbdd_cml.cc 9076 1170322322 r/32_gbdd_cml.c 1.1)
(doc/tutorial/figs/lucky-ex.fig 1531 1138032075 q/34_lucky-ex.f 1.1)
(examples/xlurette/heater/test3.res 0 1137765987 m/24_test3.res 1.1)
(xlurette/makefile 4587 1138032075 q/21_makefile 1.1)
(xlurette/makefile 4609 1196700198 q/21_makefile 1.2)
(doc/figs/nh-lurette-try.fig 2045 1138034376 q/41_nh-lurette 1.1)
(install/pixmaps/halt.xpm 511 1137765987 n/21_halt.xpm 1.1)
(source/Makefile.luc4ocaml 4882 1172658530 j/0_Makefile.o 1.3.1.3)
......@@ -525,7 +525,7 @@
(source/polyhedron.ml 15442 1137765987 d/25_polyhedron 1.21)
(test/time-CHAILLOL.exp 8235 1063029729 g/10_time-CHAIL 1.1)
(examples/rml/window.out 2210 1137765987 k/7_window.out 1.1)
(examples/Makefile 909 1172658530 j/38_Makefile 1.6)
(examples/Makefile 909 1196700198 j/38_Makefile 1.7)
(examples/xlurette/heater/test3.rif.exp 4560 1137765987 m/15_test3.rif. 1.1)
(source/Makefile.gen_fake_lutin 656 1137765987 d/17_Makefile.g 1.6)
(examples/lucky/other/test3.rif.exp 466 1137765987 k/35_test3.rif. 1.1)
......@@ -533,7 +533,7 @@
(install/pixmaps/button-close.xpm 746 1137765987 n/27_button-clo 1.1)
(i386-linux-gcc3/bin/pollux 958048 1138032075 q/19_pollux 1.1)
(source/Makefile.gnuplot 461 1122044801 i/19_Makefile.g 1.1)
(examples/lucky/external_code/call_external_c_code.luc 1167 1172658530 j/23_call_exter 1.3)
(examples/lucky/external_code/call_external_c_code.luc 1273 1196700198 j/23_call_exter 1.4)
(test/time-moucherotte.res 4158 1088412276 e/38_time-mouch 1.24)
(examples/ocaml/crazy-rabbit/crazy_rabbit-moving_obstacle3.luc 4732 1137765987 j/39_crazy_rabb 1.1)
(source/parse_poc.ml 3993 1122044801 d/15_parse_poc. 1.9)
......@@ -571,7 +571,7 @@
(install/lurettetop_sh.in 721 1137765987 g/24_lurettetop 1.2)
(doc/lucky-man/lucky-man.tex 41866 1127735479 h/34_lucky-man. 1.3)
(source/Makefile.gen_fake_lucky 1428 1172658530 g/9_Makefile.g 1.10)
(examples/lucky/C/Makefile 1174 1172658530 r/21_Makefile 1.3)
(examples/lucky/C/Makefile 1398 1196700198 r/21_Makefile 1.4)
(doc/tutorial/fault-tolerant-tut.tex 15451 1138032075 q/32_fault-tole 1.1)
(source/luc4ocaml_nolbl.ml 231 1137765987 i/39_lucaml_nol 1.2)
(examples/ocaml/crazy-rabbit/moving-obstacle3.luc 2542 1137765987 j/43_moving-obs 1.1)
......
......@@ -15,10 +15,10 @@ test:
cd lucky/C && make test ;
cd lucky/lustre && make test ;
ifneq ($(HOST_TYPE),mac)
cd xlurette/Sildex/ && make test ;
# cd xlurette/Sildex/ && make test ;
cd ocaml/crazy-rabbit/ && make test ;
endif
# cd rml/ && make test ;
cd rml/ && make test ;
ifeq ($(HOST_TYPE),sparc-sun)
cd xlurette/Scade-sparc && make test ;
else
......
......@@ -16,12 +16,22 @@ endif
ifeq ($(HOST_TYPE),win32)
EXE=.exe
CFLAGS = \
-L../../../win32/lib -L/cygdrive/c/TEMP/MinGW/lib \
-I../../../win32/include \
-L../../../lib \
-I../../../include \
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++
LUC2C=../../../win32/bin/luc2c$(EXE)
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++ -mno-cygwin -lole32
LUC2C=../../../bin/luc2c$(EXE)
endif
ifeq ($(HOST_TYPE),cygwin)
EXE=.exe
CFLAGS = \
-L../../../lib \
-I../../../include \
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++
LUC2C=../../../bin/luc2c$(EXE)
endif
......@@ -37,7 +47,7 @@ foo.o : foo.c
call_foo.o: call_foo.c
$(CC) -c $(CFLAGS) call_foo.c
foo: foo.o call_foo.o
foo$(EXE): foo.o call_foo.o
$(LINKER) $(CFLAGS) -o $@ $^ $(LIBS)
......
......@@ -19,6 +19,7 @@ MKDLLFLAGS=
LFLAGS=
SOFLAGS=-shared
#settings for WIN32
ifeq ($(HOSTTYPE),win32)
DLEXT=dll
......@@ -27,13 +28,23 @@ ifeq ($(HOSTTYPE),win32)
CC=gcc -DWIN32 -mno-cygwin
MKDLLFLAGS=-Wl,--out-implib,$(OBJDIR)/$(MAIN).a
LFLAGS=-lm
else
LD_ARCH=-DWIN32
endif
ifeq ($(HOSTTYPE),cygwin)
DLEXT=dll
EXE=.exe
LD=gcc -DWIN32
CC=gcc -DWIN32
MKDLLFLAGS=-Wl,--out-implib,$(OBJDIR)/$(MAIN).a
LFLAGS=-lm
LD_ARCH=-DWIN32
endif
ifeq ($(HOSTTYPE),mac)
LD=g++
CC=gcc
SOFLAGS = -dynamiclib
LDMAC=-DMAC
endif
LD_ARCH=-DMAC
endif
all: $(OBJDIR)/$(MAIN).$(DLEXT)
......@@ -51,7 +62,7 @@ $(OBJDIR)/%.o : $(OBJDIR) $(SRCDIR)/%.c
call_external_c_code.luc_pp:call_external_c_code.luc
../../../bin/lucky_cpp call_external_c_code.luc call_external_c_code.luc_pp $(LDMAC)
../../../bin/lucky_cpp call_external_c_code.luc call_external_c_code.luc_pp $(LD_ARCH)
test: clean $(OBJDIR)/$(MAIN).$(DLEXT) call_external_c_code.luc_pp
rm -f test.rif0 && \
......
......@@ -3,12 +3,18 @@
--
libraries {
foo_lib = "./obj/foo.so";
#ifdef MAC
foo_lib = "./obj/foo.so";
math_lib = "libm.dylib" -- the standard C math lib (which path ougth to be in LD_LIBRARY_PATH)
#else
#ifdef WIN32
foo_lib = "./obj/foo.dll";
math_lib = "libm.dll"
#else
foo_lib = "./obj/foo.so";
math_lib = "libm.so"
#endif
#endif
}
functions {
......
......@@ -18,3 +18,11 @@ EXPORT int rand_up_to(int min, int max){
}
EXPORT double msin(double x){
double res = sin(x);
return res;
};
EXPORT double msqrt(double x) {
double res = sqrt(x);
return res ;
};
......@@ -12,12 +12,12 @@ LUC2C=../../../bin/luc2c
ifeq ($(HOST_TYPE),win32)
EXE=.exe
CFLAGS = \
-L../../../win32/lib -L/cygdrive/c/TEMP/MinGW/lib \
-I../../../win32/include \
-L../../../lib -L/cygdrive/c/TEMP/MinGW/lib \
-I../../../include \
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++
LUC2C=../../../win32/bin/luc2c$(EXE)
LUC2C=../../../bin/luc2c$(EXE)
endif
ifeq ($(HOST_TYPE),mac)
LD = g++ -g
......
......@@ -7,7 +7,7 @@ SRCDIR = $(shell pwd)
# Installation directory prefix
# XXX MODIFY IT IF NECESSARY !!!
PREFIX =$(HOME)/lurette
PREFIX =$(LURETTE_PATH)
# XXX MODIFY IT IF NECESSARY !!!
......
x=11.7731842666
x=15.3993812792
x=11.6380492025
x=15.3806604998
x=17.4647998347
x=13.1055982531
x=14.4938445659
x=14.9698077408
x=19.694944039
x=13.6712249348
x=10.4404320878
x=17.078487968
x=19.5687136629
x=17.5594509133
x=18.1920006604
x=11.7047030534
x=11.5249154524
x=18.2803503743
x=16.9628921217
x=16.6986337542
x=10.01
x=10.01
Z=9411 z=-60 y=50 x=60
Z=6254 z=99 y=99 x=-148
Z=-10000 y=99 z=99 x=-148
Z=-10000 y=99 z=99 x=-148
Z=t y=f x=f
x=11.7731842666
x=15.3993812792
x=11.6380492025
x=15.3806604998
x=17.4647998347
x=13.1055982531
x=14.4938445659
x=14.9698077408
x=19.694944039
x=13.6712249348
x=10.4404320878
x=17.078487968
x=19.5687136629
x=17.5594509133
x=18.1920006604
x=11.7047030534
x=11.5249154524
x=18.2803503743
x=16.9628921217
x=16.6986337542
x=10.01
x=10.01
Z=9411 z=-60 y=50 x=60
Z=6254 z=99 y=99 x=-148
Z=-10000 y=99 z=99 x=-148
Z=-10000 y=99 z=99 x=-148
Z=t y=f x=f
......@@ -2,7 +2,7 @@
CMXA_LIB = unix.cmxa str.cmxa bdd.cmxa polka.cmxa luc4ocaml.cmxa
CMA_LIB=luc4ocaml.cma
LUC4OCAML_INSTALL_DIR = -I ../../lib
LUC4OCAML_INSTALL_DIR = -I ../../../lib
# LUC4OCAML_INSTALL_DIR = -I +lucky
LUCKY=../../../bin/lucky
......@@ -12,6 +12,18 @@ MAIN=rabbit
ifeq ($(HOSTTYPE),win32)
LD_ARCH=-DWIN32
endif
ifeq ($(HOSTTYPE),cygwin)
LD_ARCH=-DWIN32
endif
ifeq ($(HOSTTYPE),mac)
LD_ARCH=-DMAC
endif
$(MAIN).opt:$(MAIN).ml
ocamlopt.opt -cc g++ -cclib -lgmp $(LUC4OCAML_INSTALL_DIR) graphics.cmxa $(CMXA_LIB) $(MAIN).ml -o $(MAIN).opt
......@@ -61,7 +73,7 @@ utest:
#
# one can use unixisms to compose lucky programs ...
rif:rabbit-speed.luc
rm -f speed.rif; $(LUCKY) -l 2000 -pp $(LUCKY)_cpp rabbit-speed.luc | \
rm -f speed.rif; $(LUCKY) -l 2000 -pp $(LUCKY)_cpp rabbit-speed.luc $(LD_ARCH) | \
grep outs | cut -d ' ' -f 2 | awk '{print $$1 " 0.0 500.0 0.0 500.0"}' | \
$(LUCKY) rabbit-dir.luc > speed.rif
......
libraries {
#ifdef MAC
math_lib = "libm.dylib"
#else
#ifdef WIN32
math_lib = "libm.dll"
#else
math_lib = "libm.so"
#endif
#endif
}
functions {
sin : float -> float : math_lib;
cos : float -> float : math_lib
......
......@@ -177,7 +177,7 @@ let launch_demo () =
(
main_loop
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"])
(Luc4ocaml.make ["rabbit-dir-line.luc"])
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-dir-line.luc"])
i
"0.0";
ignore (Graphics.read_key ())
......@@ -192,7 +192,7 @@ let launch_demo () =
(
main_loop
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"])
(Luc4ocaml.make ["rabbit-dir-line.luc"])
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-dir-line.luc"])
i
delay;
ignore (Graphics.read_key ())
......@@ -207,7 +207,7 @@ let launch_demo () =
(
main_loop
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"])
(Luc4ocaml.make ["rabbit-dir.luc"])
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-dir.luc"])
i
"0.0";
ignore (Graphics.read_key ())
......@@ -222,8 +222,8 @@ let launch_demo () =
(
main_loop_obstacle
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"])
(Luc4ocaml.make ["rabbit-dir-obstacle.luc"])
(Luc4ocaml.make ["obstacle.luc"])
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-dir-obstacle.luc"])
(Luc4ocaml.make ~pp:"lucky_cpp" ["obstacle.luc"])
i
"0.0";
ignore (Graphics.read_key ())
......@@ -238,7 +238,7 @@ let launch_demo () =
(
main_loop_obstacle
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"])
(Luc4ocaml.make ["rabbit-dir-obstacle.luc"])
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-dir-obstacle.luc"])
(Luc4ocaml.make ~pp:"lucky_cpp" ["moving-obstacle.luc"])
(i*10)
"0.0";
......@@ -254,7 +254,7 @@ let launch_demo () =
(
main_loop_obstacle
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"])
(Luc4ocaml.make ["rabbit-dir-obstacle.luc"])
(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-dir-obstacle.luc"])
(Luc4ocaml.make ~pp:"lucky_cpp" ["moving-obstacle3.luc"])
(i*10)
"0.0";
......@@ -272,7 +272,7 @@ let _ =
main_loop_obstacle
(Luc4ocaml.make ~seed:1 ~pp:"lucky_cpp" ["rabbit-speed.luc"])
(Luc4ocaml.make ~seed:1 ["rabbit-dir-obstacle.luc"])
(Luc4ocaml.make ~seed:1 ~pp:"lucky_cpp" ["rabbit-dir-obstacle.luc"])
(Luc4ocaml.make ~seed:1 ~pp:"lucky_cpp" ["moving-obstacle3.luc"])
(int_of_string Sys.argv.(1))
Sys.argv.(2);
......
......@@ -11,7 +11,7 @@ window.ml: window.rml
window: window.ml
$(OCAMLC) -o window \
-I `$(RMLC) -where` -I +lucky -I ../lib \
-I `$(RMLC) -where` -I ../lib \
luc4ocaml.cma rml_interpreter.cma \
window.ml
......
......@@ -16,7 +16,7 @@ let process outside t =
end
external.luc env {T:float; On: event} {t: float} = ["window.luc"]
external.luc env {T:float; On:event} {t: float} = ["window.luc"]
let cpt = ref 0
......
LURETTETOP=../../bin/lurettetop -go -seed 1 --precision 2
LURETTETOP=../../../bin/lurettetop -go -seed 1 --precision 2
test:
......
LURETTETOP=../../bin/lurettetop -go --precision 2 --sut heater_control.lus \
LTOP=../../../bin/lurettetop
LURETTETOP=$(LTOP) -go --precision 2 --sut heater_control.lus \
--main-sut-node heater_control --oracle heater_control.lus \
--main-oracle-node not_a_sauna --sut-compiler verimag \
--oracle-compiler verimag --test-length 500 --thick-draw 1 \
......
-- Simulate perfect sensors that never get worn
inputs { Heat_on : bool }
......
LURETTETOP=../../bin/lurettetop
LURETTETOP=../../../bin/lurettetop
CC=g++
......
......@@ -30,7 +30,7 @@ case `./config.guess` in
HOST_TYPE=i386-linux ;;
esac;;
sparc-sun-solaris2.*) HOST_TYPE=sparc-sun ;;
i*86-*-cygwin) HOST_TYPE=win32 ;;
i*86-*-cygwin) HOST_TYPE=cygwin ;;
i*86-apple*) HOST_TYPE=mac ;;
*) AC_MSG_ERROR(Unsupported architecture);;
esac
......@@ -171,7 +171,7 @@ AC_SUBST(EC2C)
# Scade tools
case "$HOST_TYPE" in
win32)
win32|cygwin)
AC_CHECK_PROG(SCADE2LUSTREBIN,SCADE2LUSTRE.EXE,SCADE2LUSTRE.EXE,no)
if test "$SCADE2LUSTREBIN" = no ; then
......@@ -231,6 +231,22 @@ AC_SUBST(SCADE_CG)
AC_SUBST(SCADE_INSTALL_DIR)
#-----------------------------------------------------------------------------#
# test whether socket works
AC_CHECK_FUNC(socket, :, [
dnl hopefully we wont include too many libraries
AC_CHECK_LIB(socket, main)
AC_CHECK_LIB(net, main)
AC_CHECK_LIB(nsl_s, main)
AC_CHECK_LIB(nsl, main)
AC_CHECK_LIB(inet, socket)
AC_CHECK_LIB(gen, main)
])
#AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))