Commit 124c55f1 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.135 Tue, 06 May 2003 15:51:08 +0200 by jahier

Parent-Version:      0.134
Version-Log:

Implement a check_assertion rule that checks every programs assertions.

source/*.ml:
   Consistently display the help msg on stderr if something bad happened,
   and on stdout if --help is provided at the command line.

source/lurette.ml:
source/sim2chro.ml:
   Fix a bug (found by Nicolas Dervaux) where the sut output var were
   not in the same order than in their declaration.

   Also, interchange input by output in the produced rif file, since
   it is more sensible this way from the tester point of view.

Project-Description: Lurette
parent 4bc90dac
......@@ -7,7 +7,7 @@
(source/constraint.mli 1601 1045489850 c/18_constraint 1.5)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 64 1034006019 d/10_Changes 1.1)
(TODO 5762 1051024737 d/22_TODO 1.13)
(TODO 6007 1052229068 d/22_TODO 1.14)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/ne.mli 2138 1050421093 c/22_ne.mli 1.6)
(polka/documentation/polka.texi 109061 1047029868 e/17_polka.texi 1.1)
......@@ -17,21 +17,20 @@
(polka/C/internal.c 699 1047029868 e/8_internal.c 1.1)
(mlcuddidl/bdd_caml.c 57199 1034006019 d/4_bdd_caml.c 1.1)
(source/solver.ml 31036 1050421093 39_solver.ml 1.47)
(ihm/xlurette/makefile 1571 1051024737 c/16_makefile 1.10)
(ihm/xlurette/makefile 2804 1052229068 c/16_makefile 1.11)
(polka/C/internal.h 958 1047029868 e/0_internal.h 1.1)
(source/command_line.ml 5079 1050578564 b/20_command_li 1.13)
(test/cudd_gc_problem.rif.exp 7881 1050421093 e/30_cudd_gc_pr 1.1)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(share/lucky_init.sh.in 419 1051024737 e/24_lucky_init 1.3)
(make_lurette 1306 1034006019 27_make_luret 1.17)
(mlcuddidl/idd_caml.c 15964 1034006019 c/50_idd_caml.c 1.1)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(source/command_line.mli 1503 1046074449 b/21_command_li 1.11)
(source/Makefile.lucky 2597 1050578564 b/41_Makefile.i 1.18)
(source/Makefile.lucky 2684 1052229068 b/41_Makefile.i 1.19)
(polka/README 1437 1047029868 e/19_README 1.1)
(polka/Makefile.depend 136 1047029868 d/30_Makefile.d 1.1)
(README 2115 1051024737 10_README 1.8)
(README 2266 1052229068 10_README 1.9)
(source/pnumsolver.ml 9273 1045489850 d/23_pnumsolver 1.2)
(source/polyhedron.ml 7661 1049961831 d/25_polyhedron 1.5)
(cuddaux/cuddauxMisc.c 13842 1034006019 c/27_cuddauxMis 1.1)
......@@ -39,7 +38,6 @@
(polka/C/poly.c 48492 1047029868 e/5_poly.c 1.1)
(doc/ocamldoc.sty 1380 1008328137 b/12_ocamldoc.s 1.1)
(polka/C/cherni.c 28811 1047029868 e/9_cherni.c 1.1)
(test/test_gen_stubs.h 1818 1020068208 b/45_test_gen_s 1.1)
(source/command_line_luc_exe.mli 1187 1050421093 b/34_command_li 1.10)
(polka/C/poly.h 4314 1047029868 d/49_poly.h 1.1)
(source/formula.mli 2862 1046682069 44_formula.ml 1.22)
......@@ -51,7 +49,6 @@
(polka/caml/polka_caml.h 1922 1047029868 d/36_polka_caml 1.1)
(mlcuddidl/mtbdd.ml 10185 1034006019 c/44_mtbdd.ml 1.1)
(source/prevar.ml 2896 1050421093 d/18_prevar.ml 1.3)
(lurette.depfull.dot 49 1007651448 b/5_lurette.de 1.2)
(mlcuddidl/idd.ml 7061 1034006019 d/0_idd.ml 1.1)
(test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1)
(source/eval.ml 7246 1050421093 49_eval.ml 1.14)
......@@ -61,14 +58,14 @@
(source/automata.mli 3396 1033738731 b/46_automata.m 1.3)
(source/print.mli 1136 1045558187 46_print.mli 1.13)
(polka/caml/Makefile 6559 1047029868 d/45_Makefile 1.1)
(ihm/xlurette/xlurette_glade_main.ml 30472 1051024737 c/12_xlurette_g 1.18)
(ihm/xlurette/xlurette_glade_main.ml 30749 1052229068 c/12_xlurette_g 1.19)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 55421 1051024737 c/13_xlurette.g 1.13)
(ihm/xlurette/xlurette.glade 55996 1052229068 c/13_xlurette.g 1.14)
(mlcuddidl/manager_caml.c 39233 1034006019 c/45_manager_ca 1.1)
(test/tram_simple.h 1746 1013519411 b/25_tram_simpl 1.1)
(test/losange.luc 410 1046768487 d/27_losange.lu 1.2)
(test/time-ecrins.exp 8236 1051024737 d/21_time-ecrin 1.16)
(test/gyro.rif.exp 10946 1052229068 e/36_gyro.rif.e 1.1)
(test/time-ecrins.exp 8235 1052229068 d/21_time-ecrin 1.17)
(source/value.ml 2358 1049961831 c/23_value.ml 1.4)
(source/gne.ml 2774 1046682069 b/37_gne.ml 1.5)
(source/formula.ml 5962 1046682069 45_formula.ml 1.28)
......@@ -88,19 +85,20 @@
(source/call_lurette_main.c 322 1050421093 e/28_call_luret 1.1)
(polka/C/vector.c 13780 1047029868 e/3_vector.c 1.1)
(share/Makefile.test 1645 1051024737 c/25_user-rules 1.6)
(source/Makefile.lurette_lib 2166 1050578564 c/2_Makefile.l 1.18)
(source/Makefile.lurette_lib 2397 1052229068 c/2_Makefile.l 1.19)
(test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
(mlcuddidl/bdd.idl 18233 1034006019 d/7_bdd.idl 1.1)
(polka/caml/polka_parser.mly 1729 1047029868 d/40_polka_pars 1.1)
(source/gen_stubs.ml 21412 1050578564 24_generate_l 1.45)
(source/gen_stubs.ml 21586 1052229068 24_generate_l 1.46)
(polka/C/pkint.h 6036 1047029868 e/12_pkint.h 1.1)
(polka/caml/vector.idl 8669 1047029868 d/35_vector.idl 1.1)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(source/sim2chro.mli 1524 1037625990 b/23_sim2chro.m 1.6)
(source/sim2chro.mli 1545 1052229068 b/23_sim2chro.m 1.7)
(share/lucky_init.csh.in 420 1051024737 e/23_lucky_init 1.3)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(polka/C/vector.h 2103 1047029868 d/47_vector.h 1.1)
(polka/C/satmat.c 6254 1047029868 e/4_satmat.c 1.1)
(share/plot 11384 1052229068 e/35_plot 1.1)
(source/solver.mli 1003 1046682069 38_solver.mli 1.14)
(mlcuddidl/manager.ml 8017 1034006019 c/47_manager.ml 1.1)
(test/passerelle.luc 995 1046682069 b/17_passerelle 1.10)
......@@ -110,38 +108,36 @@
(source/ne.ml 9564 1050421093 c/21_ne.ml 1.7)
(demo-xlurette/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(source/parse_env.ml 41134 1051024737 41_parse_env. 1.43)
(share/Makefile.lurette.in 786 1051024737 b/38_Makefile.l 1.21)
(share/Makefile.lurette.in 783 1052229068 b/38_Makefile.l 1.22)
(mlcuddidl/session.ml 603 1034006019 c/37_session.ml 1.1)
(source/graph.mli 2185 1037625990 13_graph.mli 1.10)
(source/store.mli 2891 1046074449 b/26_rnumsolver 1.16)
(test/time-ossau.res 8238 1051024737 b/49_time.res 1.42)
(test/time-ossau.res 8238 1052229068 b/49_time.res 1.43)
(source/automata.ml 19223 1046682069 b/47_automata.m 1.7)
(Makefile 68 1051024737 d/13_Makefile 1.4)
(test/vrai_tram.c 3060 1027066799 b/8_vrai_tram. 1.3)
(cuddaux/cuddauxBridge.c 6099 1034006019 c/31_cuddauxBri 1.1)
(test/heater_float.rif.exp 1040 1047029868 b/30_heater_flo 1.13)
(cuddaux/Makefile 3169 1051024737 c/35_Makefile 1.5)
(test/heater_float.rif.exp 1040 1052229068 b/30_heater_flo 1.14)
(cuddaux/Makefile 3344 1052229068 c/35_Makefile 1.6)
(polka/C/bit.c 3026 1047029868 e/10_bit.c 1.1)
(test/time-ossau.exp 8238 1051024737 b/48_time.exp 1.39)
(test/time-ossau.exp 8238 1052229068 b/48_time.exp 1.40)
(source/print.ml 5787 1045558187 47_print.ml 1.22)
(mlcuddidl/macros.m4 11290 1034006019 c/49_macros.m4 1.1)
(test/vrai_tram.h 2468 1027066799 b/7_vrai_tram. 1.3)
(polka/caml/polkaIO.ml 1652 1047029868 d/44_polkaIO.ml 1.1)
(test/heater_int.rif.exp 812 1047029868 b/28_heater_int 1.11)
(test/heater_int.rif.exp 812 1052229068 b/28_heater_int 1.12)
(source/parse_poc.ml 6265 1047029868 d/15_parse_poc. 1.2)
(polka/C/bit.h 1380 1047029868 e/2_bit.h 1.1)
(demo-xlurette/chaudiere/chaudiere.luc 446 1032789516 c/11_chaudiere. 1.5)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(source/lurettetop.ml 33481 1051024737 c/1_lurettetop 1.31)
(source/lurettetop.ml 33461 1052229068 c/1_lurettetop 1.32)
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
(source/constraint.ml 2762 1050421093 c/19_constraint 1.7)
(polka/caml/Makefile.depend 744 1047029868 d/32_Makefile.d 1.1)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 36034 1051024737 c/15_xlurette_g 1.12)
(ihm/xlurette/xlurette_glade_interface.ml 37539 1052229068 c/15_xlurette_g 1.13)
(test/losange-3d2.luc 368 1050421093 e/32_losange-3d 1.1)
(test/Makefile 26 1051024737 c/0_Makefile 1.12)
(user-rules 19064 1051024737 c/14_myrules 1.32)
(user-rules 20654 1052229068 c/14_myrules 1.33)
(mlcuddidl/cudd_caml.c 22890 1034006019 d/3_cudd_caml. 1.1)
(test/usager.luc 508 1046682069 b/14_usager.env 1.11)
(polka/C/config.h 77 1047029868 e/13_config.h 1.1)
......@@ -157,18 +153,18 @@
(source/lurette.mli 456 1049961831 11_lurette.ml 1.13)
(polka/caml/polka.ml 5485 1047029868 d/39_polka.ml 1.1)
(mlcuddidl/rdd.ml 8746 1034006019 c/41_rdd.ml 1.1)
(share/configure.in 2680 1051024737 d/11_configure. 1.5)
(share/configure.in 2683 1052229068 d/11_configure. 1.6)
(polka/C/matrix.c 19090 1047029868 e/7_matrix.c 1.1)
(test/tram.luc 1092 1046682069 b/15_tram.env 1.10)
(share/Makefile.common.in 233 1049961831 d/12_Makefile.c 1.4)
(share/Makefile.common.in 189 1052229068 d/12_Makefile.c 1.5)
(demo-xlurette/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
(cuddaux/cuddaux.h 2381 1034006019 c/33_cuddaux.h 1.1)
(polka/C/matrix.h 3461 1047029868 d/51_matrix.h 1.1)
(source/pnumsolver.mli 2322 1045489850 d/24_pnumsolver 1.2)
(mlcuddidl/sedscript 203 1034006019 c/38_sedscript 1.1)
(source/env_state.mli 6976 1050421093 50_env_state. 1.29)
(test/ControleurPorte.rif.exp 4676 1049961831 b/29_Controleur 1.13)
(source/show_luc.ml 3230 1050421093 e/25_show_luc.m 1.2)
(test/ControleurPorte.rif.exp 4676 1052229068 b/29_Controleur 1.14)
(source/show_luc.ml 3449 1052229068 e/25_show_luc.m 1.3)
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
(polka/caml/polka_lexer.mli 200 1047029868 d/41_polka_lexe 1.1)
(polka/caml/polka.mli 716 1047029868 d/38_polka.mli 1.1)
......@@ -178,7 +174,7 @@
(polka/caml/polkaIO.mli 1517 1047029868 d/43_polkaIO.ml 1.1)
(source/parse_poc.mli 1821 1047029868 d/29_parse_poc. 1.1)
(source/Makefile.gen_stubs 219 1050578564 b/42_Makefile.g 1.6)
(test/temp_float.luc 743 1046682069 b/51_temp_float 1.6)
(test/temp_float.luc 744 1052229068 b/51_temp_float 1.7)
(polka/C/polka.c 4969 1047029868 e/6_polka.c 1.1)
(source/polyhedron.mli 940 1045489850 d/26_polyhedron 1.1)
(mlcuddidl/bdd.mli 8573 1034006019 d/5_bdd.mli 1.1)
......@@ -186,29 +182,29 @@
(source/command_line_luc_exe.ml 3533 1050578564 b/33_command_li 1.14)
(source/lurette_exe.c 220 1050421093 e/27_lurette_ex 1.2)
(source/env.ml 7849 1050421093 16_env.ml 1.30)
(test/time-ecrins.res 8236 1051024737 d/20_time-ecrin 1.16)
(test/time-ecrins.res 8235 1052229068 d/20_time-ecrin 1.17)
(source/value.mli 1100 1049961831 c/24_value.mli 1.2)
(polka/Makefile.config 1677 1051024737 e/20_Makefile.c 1.4)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 6914 1051024737 c/20_Makefile 1.14)
(source/Makefile 7458 1052229068 c/20_Makefile 1.15)
(source/graph.ml 2339 1037625990 14_graph.ml 1.8)
(test/cudd_gc_problem.luc 227680 1050421093 e/29_cudd_gc_pr 1.1)
(demo-xlurette/chaudiere/chaudiere_ctrl.lus 177 1031732392 c/9_chaudiere_ 1.1)
(test/losange-3d.rif.exp 2675 1050421093 e/31_losange-3d 1.1)
(polka/documentation/Makefile 476 1047029868 e/18_Makefile 1.1)
(source/sim2chro.ml 2742 1046682069 b/24_sim2chro.m 1.15)
(source/sim2chro.ml 2944 1052229068 b/24_sim2chro.m 1.16)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
(source/luc_exe.ml 13997 1050421093 b/32_ima_exe.ml 1.30)
(source/luc_exe.ml 14047 1052229068 b/32_ima_exe.ml 1.31)
(source/gne.mli 1557 1046682069 b/36_gne.mli 1.5)
(source/lurette.ml 17582 1051024737 12_lurette.ml 1.67)
(source/lurette.ml 17856 1052229068 12_lurette.ml 1.68)
(polka/C/Makefile.depend 1081 1047029868 d/46_Makefile.d 1.1)
(lurette.dep.dot 49 1007651448 b/4_lurette.de 1.2)
(doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
(cuddaux/cuddauxCompose.c 13638 1034006019 c/30_cuddauxCom 1.1)
(source/gen_fake_lutin.ml 3521 1050578564 d/16_gen_fake_l 1.3)
(source/gen_fake_lutin.ml 3973 1052229068 d/16_gen_fake_l 1.4)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(polka/Makefile 1636 1047029868 e/21_Makefile 1.1)
(test/porte.luc 996 1049961831 b/16_porte.env 1.10)
(share/gnuplot-rif 974 1052229068 e/34_gnuplot-ri 1.1)
(source/eval.mli 1265 1050421093 48_eval.mli 1.11)
(source/Makefile.show_luc 1033 1050578564 b/40_Makefile.s 1.9)
(mlcuddidl/Makefile 7240 1051024737 d/9_Makefile 1.5)
(mlcuddidl/Makefile 7412 1052229068 d/9_Makefile 1.6)
The LURETTE V2 package
The LURETTE V2 package
* WHAT IS IT?
The lurette V2 package is a set of tools that let one test and
simulate reactive programs (e.g., written in lustre). Its heart is
made of an engine that draws (boolean, integers and real) values
according to a non-deterministic specification written in the lutin
The lurette V2 package is a set of tools that let one test and
simulate reactive programs (e.g., written in lustre). Its heart is
made of an engine that draws (boolean, integers and real) values
according to a non-deterministic specification written in the lutin
language.
The provided tools are:
xlurette:
xlurette is a GUI build on top of lurettetop (see above).
It is probably your best entry point if you want to
(automatically) test your lustre programs.
Cf doc/lurette-tut.ps and/or check the tooltip displayed
when mouse pointing at the different buttons of the GUI.
xlurette:
xlurette is a GUI build on top of lurettetop (see above). It is
probably your best entry point if you want to test your lustre
programs.
Cf doc/lurette-tut.ps and/or check the tool-tip displayed when
mouse pointing at the different buttons of the GUI.
lurettetop:
lurettetop is a top level loop that let one test
reactive programs written in lustre. It is basically the non
graphical version of xlurette.
You can type "help" at the prompt for more information.
lurettetop is a top level loop that let one test reactive
programs written in lustre. It is basically the non graphical
version of xlurette. You can type "help" at the prompt to see
the list of commands.
lutin:
lutin is an high level language for specifying non
deterministic systems. As far as lurette is concerned,
lutin can be used to simulate the System Under Test
environnement.
lutin:
lutin is an high level language/compiler for specifying non
deterministic systems. As far as lurette is concerned, lutin can
be used to simulate the System Under Test (SUT) environment.
More information is available in the doc/lutin.pdf file.
There are also tools which are used by the ones above that one might
want to use.
gen_fake_lutin:
generates a fake lutin file (from C files generated by the
lustre compiler). It is automatically called from xlurette,
whenever you try to test a program without providing any
environment for it; hence you should not need to use
it directly.
generates a fake lutin file (from C files generated by the
lustre compiler). It is automatically called from xlurette,
whenever you try to test a program without providing an
environment for it; hence you should not need to use it directly.
show_luc:
This program lets you vizualise lucky (.luc) files offline.
It is also called automatically from xlurette and lurettetop.
This program lets you vizualise lucky (.luc) files off-line. It
is also called automatically from xlurette and lurettetop.
lucky:
A lucky (.luc) files interpreter. ".luc" file is the abstract
machine format the lutin compiler produces.
Being able to simulate/executes lutin programs outside xlurette
can sometimes be convenient.
lucky:
A lucky (.luc) files interpreter. ".luc" file is the abstract
machine format the lutin compiler produces. Being able to
simulate/executes lutin programs outside xlurette can sometimes
be convenient.
Also cf the tool section at the url http://www-verimag.imag.fr/~synchron/
Also confere the tool section at the url http://www-verimag.imag.fr/~synchron/
-o-
-o-
* INSTALLATION
......@@ -63,7 +66,7 @@ Also cf the tool section at the url http://www-verimag.imag.fr/~synchron/
$ cd lurette-XXX
$ ./INSTALL
-o-
-o-
* Authors
......
......@@ -5,20 +5,20 @@
*********** A faire maintenant
* attention, xlurette suppose que j'ai du lustre (appel de lusinfo),
alors que j'avais dit que ca aurait pu etre du c ...
* lurettetop :utilise Filename.temp_file pour creer un repertoire temporaire
pour lurette.
* xlurette: si le nom du repertoire est le meme que le repertoire courant, je pourrais l'omettre ...
* Utiliser l'ordre des parametres plutot que leur noms
Quoique, quand on fait le produit de plusieurs automates,
ca n'est guere pratique...
--> 2 options : --var-order (default), --var-name
* rajouter une option qui dit si les formules doivent etre tronquees
dans show_luc
* Mettre a jour le parseur wrt les modifs que j'ai faite a la syntax
(noeuds transiants/stationnaires + formula = ...)
* rajouter une commande plot qui fasse appel a gnuplot plut qu'a sim2chro.
* Repasser a une notation infixée pour le format lucky. Ne pas faire
la verif de type en meme temps que le parsing ->
......@@ -46,6 +46,12 @@ la verif de type en meme temps que le parsing ->
* remplacer l'epaisseur de formules par un taux de couverture
* rajouter une option qui dit si les formules doivent etre tronquees
dans show_luc
* Mettre a jour le parseur wrt les modifs que j'ai faite a la syntax
(noeuds transiants/stationnaires + formula = ...)
......
......@@ -39,9 +39,17 @@ ICFLAGS = \
#
# XCFLAGS should be the same than the one with which CUDD is compiled
#
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
# i386-linux
# XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
# sparc-sun
# XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
# Windows95/98/NT with Cygwin tools
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864
CFLAGS = $(ICFLAGS) $(XCFLAGS) -O3 -DNDEBUG
CFLAGS_DEBUG = $(ICFLAGS) $(XCFLAGS) -O1 -g -UNDEBUG
CFLAGS_PROF = $(ICFLAGS) $(XCFLAGS) -O3 -DNDEBUG -g -pg
......
-include $(LURETTE_PATH)/Makefile.common
-include $(LURETTE_PATH)/Makefile.common.source
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := ../../$(HOSTTYPE)/bin
BIN_INSTALL_DIR := ../../$(HOST_TYPE)/bin
endif
THREAD=
# THREAD=-thread threads.cma
xlurette: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"LURETTE_PATH\") \^ \"\/share\/pixmaps\/\" \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml
ocamlc -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlc -c -i -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlc -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
......@@ -21,22 +28,37 @@ xlurette: dummy
opt: dummy
mlglade xlurette.glade
ocamlopt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx \
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"LURETTE_PATH\") \^ \"\/share\/pixmaps\/\" \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
opt_opt: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"LURETTE_PATH\") \^ \"\/share\/pixmaps\/\" \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -pp "camlp4o" -c -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -linkall -I +lablgtk -I +str -labels -o xlurette str.cmxa unix.cmxa lablgtk.cmxa gtkInit.cmx \
ocamlopt.opt -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
# ocamlopt.opt -cclib /usr/openwin/lib/libXext.a -cclib /usr/openwin/lib/libX11.a -cclib /usr/local/lib/libglib.a -cclib /usr/local/lib/libgdk.a -cclib /usr/local/lib/libgtk.a -cclib /usr/local/lib/libgmodule.a -cclib -L/usr/openwin/lib -I /home/jahier/sparc-sun/lib -I +lablgtk -I +str -labels -o xlurette str.cmxa unix.cmxa lablgtk.cmxa gtkInit.cmx xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx -cclib -v
install: xlurette
install: opt
cp xlurette $(BIN_INSTALL_DIR)
......
......@@ -77,14 +77,14 @@
<widget>
<class>GtkButton</class>
<name>show_env_button</name>
<tooltip>Show the automata corresponding to the current environment</tooltip>
<tooltip>Show the automata view of the SUT environment</tooltip>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>show_env_button_clicked</handler>
<last_modification_time>Thu, 12 Sep 2002 08:23:10 GMT</last_modification_time>
</signal>
<label>Show Environment</label>
<label>Sut Environment</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<left_attach>0</left_attach>
......@@ -438,6 +438,7 @@
<widget>
<class>GtkCombo</class>
<name>sut_name</name>
<can_focus>True</can_focus>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
......@@ -449,7 +450,7 @@
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>sut_name_entry</name>
<tooltip>Name of the program under test</tooltip>
<tooltip>Name of the file containing the System Under Test (SUT)</tooltip>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
......@@ -467,6 +468,7 @@
<widget>
<class>GtkCombo</class>
<name>sut_node</name>
<can_focus>True</can_focus>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
......@@ -483,7 +485,7 @@
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>sut_node_entry</name>
<tooltip>Sut node name</tooltip>
<tooltip>SUT node name</tooltip>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
......@@ -521,6 +523,7 @@
<widget>
<class>GtkCombo</class>
<name>oracle_name</name>
<can_focus>True</can_focus>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
......@@ -554,6 +557,7 @@
<widget>
<class>GtkCombo</class>
<name>oracle_node</name>
<can_focus>True</can_focus>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
......@@ -583,6 +587,7 @@
<widget>
<class>GtkCombo</class>
<name>env_name</name>
<can_focus>True</can_focus>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
......@@ -608,7 +613,7 @@
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>env_name_entry</name>
<tooltip>Environment file name</tooltip>
<tooltip>Environment file name: its input (resp output) variable types and names should match exactly the SUT output variables (resp input). Note that if no environment is provided, a fake one will generated; this file can serve as a basis to write more sensible environment for the current SUT.</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
......@@ -755,7 +760,7 @@
<handler>quit</handler>
<last_modification_time>Thu, 19 Sep 2002 08:53:53 GMT</last_modification_time>
</signal>
<label> </label>
<label> </label>
<icon>close.xpm</icon>
</widget>
</widget>
......@@ -921,7 +926,7 @@
<widget>
<class>GtkLabel</class>
<name>rif_file_label</name>
<label>Output file</label>
<label>Base output file name </label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......@@ -1012,8 +1017,8 @@
<widget>
<class>GtkEntry</class>
<name>rif_file</name>
<tooltip>Name of file the test results is put in</tooltip>
<name>rif_file_basename</name>
<tooltip>Begin of the (.rif) file name used to save the test data. If empty, the default value is made of the name of the sut, the name of its environment, and the test length</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
......
......@@ -62,11 +62,11 @@ let show_env_button = GButton.button
~shrink:`NONE
~fill:`X
)
~label: "Environment"
~label: "Sut Environment"
()
in
let _ = GtkBase.Widget.set_can_focus show_env_button#as_widget true in
let _ = tooltips#set_tip ~text:"Show the automata corresponding to the current environment" show_env_button#coerce in
let _ = tooltips#set_tip ~text:"Show the automata view of the SUT environment" show_env_button#coerce in
let oracle_label = GMisc.label
~text: "Oracle"
~packing:(table2#attach ~left:0
......@@ -214,12 +214,12 @@ let toolbar5 = GButton.toolbar
()
in
let button29 = toolbar5#insert_button
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/open.xpm" ()) ())#coerce
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "LURETTE_PATH") ^ "/share/pixmaps/" ^ "open.xpm") ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Browse for an environment file" button29#coerce in
let button30 = toolbar5#insert_button
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/open_plus.xpm" ()) ())#coerce
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "LURETTE_PATH") ^ "/share/pixmaps/" ^ "open_plus.xpm") ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Browse to add an environment to the curent one(s)" button30#coerce in
......@@ -242,7 +242,7 @@ let toolbar6 = GButton.toolbar
()
in
let button32 = toolbar6#insert_button
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/open.xpm" ()) ())#coerce
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "LURETTE_PATH") ^ "/share/pixmaps/" ^ "open.xpm") ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Browse for a reactive program file to test" button32#coerce in
......@@ -265,7 +265,7 @@ let toolbar7 = GButton.toolbar
()
in
let button33 = toolbar7#insert_button
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/open.xpm" ()) ())#coerce
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "LURETTE_PATH") ^ "/share/pixmaps/" ^ "open.xpm") ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Browse for an oracle" button33#coerce in
......@@ -299,10 +299,11 @@ let sut_name = GEdit.combo
~use_arrows:`DEFAULT
()
in
let _ = GtkBase.Widget.set_can_focus sut_name#as_widget true in
let sut_name_entry = sut_name#entry
in
let _ = GtkBase.Widget.set_can_focus sut_name#as_widget true in
let _ = tooltips#set_tip ~text:"Name of the program under test" sut_name#coerce in
let _ = tooltips#set_tip ~text:"Name of the file containing the System Under Test (SUT)" sut_name#coerce in
let _ = sut_name_entry#set_editable true in
let _ = sut_name_entry#set_visibility true in
let _ = sut_name_entry#set_max_length 0 in
......@@ -317,10 +318,11 @@ let sut_node = GEdit.combo
~use_arrows:`DEFAULT
()
in
let _ = GtkBase.Widget.set_can_focus sut_node#as_widget true in
let sut_node_entry = sut_node#entry
in
let _ = GtkBase.Widget.set_can_focus sut_node#as_widget true in
let _ = tooltips#set_tip ~text:"Sut node name" sut_node#coerce in
let _ = tooltips#set_tip ~text:"SUT node name" sut_node#coerce in
let _ = sut_node_entry#set_editable true in
let _ = sut_node_entry#set_visibility true in
let _ = sut_node_entry#set_max_length 0 in
......@@ -350,6 +352,7 @@ let oracle_name = GEdit.combo
~use_arrows:`DEFAULT
()
in