Commit 4bc90dac authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.134 Tue, 22 Apr 2003 17:18:57 +0200 by jahier

Parent-Version:      0.133
Version-Log:

Various changes related to the packaging of lurette.

Project-Description: Lurette
parent dbc00f74
......@@ -2,29 +2,27 @@
;; REALLY bad things.
(Created-By-Prcs-Version 1 3 3)
(source/show_env.mli 1091 1033738731 42_show_env.m 1.8)
(source/util.ml 18917 1050421093 35_util.ml 1.44)
(source/util.ml 18915 1051024737 35_util.ml 1.45)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(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 5818 1050578564 d/22_TODO 1.12)
(TODO 5762 1051024737 d/22_TODO 1.13)
(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)
(source/ocaml2c.idl 1484 1050578564 e/26_ocaml2c.id 1.2)
(demo/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(cuddaux/Changes 42 1034006019 c/36_Changes 1.1)
(mlcuddidl/idd.idl 10595 1034006019 d/1_idd.idl 1.1)
(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 1589 1050421093 c/16_makefile 1.9)
(ihm/xlurette/makefile 1571 1051024737 c/16_makefile 1.10)
(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)
(configure.in 2589 1050578564 d/11_configure. 1.4)
(demo/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 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)
......@@ -33,7 +31,7 @@
(source/Makefile.lucky 2597 1050578564 b/41_Makefile.i 1.18)
(polka/README 1437 1047029868 e/19_README 1.1)
(polka/Makefile.depend 136 1047029868 d/30_Makefile.d 1.1)
(README 1887 1049961831 10_README 1.7)
(README 2115 1051024737 10_README 1.8)
(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)
......@@ -59,24 +57,23 @@
(source/eval.ml 7246 1050421093 49_eval.ml 1.14)
(polka/Changes 1502 1047029868 e/22_Changes 1.1)
(source/env.mli 2026 1040290175 15_env.mli 1.17)
(demo/chaudiere/chaudiere.luc 446 1032789516 c/11_chaudiere. 1.5)
(test/temp_int.luc 698 1046682069 b/50_temp_int.e 1.5)
(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 29622 1050421093 c/12_xlurette_g 1.17)
(ihm/xlurette/xlurette_glade_main.ml 30472 1051024737 c/12_xlurette_g 1.18)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 55225 1050578564 c/13_xlurette.g 1.12)
(ihm/xlurette/xlurette.glade 55421 1051024737 c/13_xlurette.g 1.13)
(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 8538 1050578564 d/21_time-ecrin 1.15)
(test/time-ecrins.exp 8236 1051024737 d/21_time-ecrin 1.16)
(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)
(Makefile.common.source 261 1050578564 e/33_Makefile.c 1.1)
(source/Makefile.gen_fake_lutin 255 1050578564 d/17_Makefile.g 1.2)
(Makefile.common.source 242 1051024737 e/33_Makefile.c 1.2)
(polka/C/Makefile 3528 1047029868 e/15_Makefile 1.1)
(test/giro/giro.luc 2755 1033738731 c/6_giro.ima 1.4)
(source/control.ml 4445 1036675177 c/4_control.ml 1.4)
......@@ -90,16 +87,17 @@
(mlcuddidl/idd.mli 5470 1034006019 c/51_idd.mli 1.1)
(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)
(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)
(user-rules.skel 1730 1050578564 c/25_user-rules 1.5)
(source/gen_stubs.ml 21412 1050578564 24_generate_l 1.45)
(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)
(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)
......@@ -110,20 +108,21 @@
(mlcuddidl/mtbdd.mli 4395 1034006019 c/43_mtbdd.mli 1.1)
(polka/C/satmat.h 1254 1047029868 d/48_satmat.h 1.1)
(source/ne.ml 9564 1050421093 c/21_ne.ml 1.7)
(source/parse_env.ml 41128 1050421093 41_parse_env. 1.42)
(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)
(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 6494 1050578564 b/49_time.res 1.41)
(test/time-ossau.res 8238 1051024737 b/49_time.res 1.42)
(source/automata.ml 19223 1046682069 b/47_automata.m 1.7)
(demo/chaudiere/chaudiere_ctrl.lus 177 1031732392 c/9_chaudiere_ 1.1)
(Makefile 1437 1050578564 d/13_Makefile 1.3)
(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 3136 1050578564 c/35_Makefile 1.4)
(cuddaux/Makefile 3169 1051024737 c/35_Makefile 1.5)
(polka/C/bit.c 3026 1047029868 e/10_bit.c 1.1)
(test/time-ossau.exp 6494 1050578564 b/48_time.exp 1.38)
(test/time-ossau.exp 8238 1051024737 b/48_time.exp 1.39)
(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)
......@@ -131,18 +130,18 @@
(test/heater_int.rif.exp 812 1047029868 b/28_heater_int 1.11)
(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 33370 1050421093 c/1_lurettetop 1.30)
(lucky_init.csh.in 360 1049961831 e/23_lucky_init 1.2)
(source/lurettetop.ml 33481 1051024737 c/1_lurettetop 1.31)
(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 35669 1050421093 c/15_xlurette_g 1.11)
(ihm/xlurette/xlurette_glade_interface.ml 36034 1051024737 c/15_xlurette_g 1.12)
(test/losange-3d2.luc 368 1050421093 e/32_losange-3d 1.1)
(test/Makefile 98 1050578564 c/0_Makefile 1.11)
(user-rules 23749 1050578564 c/14_myrules 1.31)
(test/Makefile 26 1051024737 c/0_Makefile 1.12)
(user-rules 19064 1051024737 c/14_myrules 1.32)
(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)
......@@ -158,8 +157,11 @@
(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)
(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)
(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)
......@@ -182,24 +184,23 @@
(mlcuddidl/bdd.mli 8573 1034006019 d/5_bdd.mli 1.1)
(polka/C/polka.h 1478 1047029868 d/50_polka.h 1.1)
(source/command_line_luc_exe.ml 3533 1050578564 b/33_command_li 1.14)
(Makefile.lurette 792 1050578564 b/38_Makefile.l 1.20)
(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 8538 1050578564 d/20_time-ecrin 1.15)
(test/time-ecrins.res 8236 1051024737 d/20_time-ecrin 1.16)
(source/value.mli 1100 1049961831 c/24_value.mli 1.2)
(lucky_init.sh.in 359 1049961831 e/24_lucky_init 1.2)
(polka/Makefile.config 1644 1050578564 e/20_Makefile.c 1.3)
(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 6434 1050578564 c/20_Makefile 1.13)
(source/Makefile 6914 1051024737 c/20_Makefile 1.14)
(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)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
(source/luc_exe.ml 13997 1050421093 b/32_ima_exe.ml 1.30)
(source/gne.mli 1557 1046682069 b/36_gne.mli 1.5)
(source/lurette.ml 17588 1050578564 12_lurette.ml 1.66)
(source/lurette.ml 17582 1051024737 12_lurette.ml 1.67)
(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)
......@@ -207,8 +208,7 @@
(source/gen_fake_lutin.ml 3521 1050578564 d/16_gen_fake_l 1.3)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(polka/Makefile 1636 1047029868 e/21_Makefile 1.1)
(Makefile.common.in 233 1049961831 d/12_Makefile.c 1.4)
(test/porte.luc 996 1049961831 b/16_porte.env 1.10)
(source/eval.mli 1265 1050421093 48_eval.mli 1.11)
(source/Makefile.show_luc 1033 1050578564 b/40_Makefile.s 1.9)
(mlcuddidl/Makefile 7207 1050578564 d/9_Makefile 1.4)
(mlcuddidl/Makefile 7240 1051024737 d/9_Makefile 1.5)
#
# Makefile to build, lurette, lucky, and co, plus cuddaux and mlcuddidl.
#
# In order to use and install it, you need somehow in your paths:
#
# (1) The ocaml compiler (version 3.02 or higher):
# http://caml.inria.fr/
#
# (2) The stub code generator CamlIDL (version 1.04):
# http://caml.inria.fr/camlidl/
#
# (3) The BDD library CUDD (version 2.3.1)
# http://vlsi.colorado.edu/~fabio/CUDD/cuddIntro.html
#
# You also need cuddaux aux and mlcuddidl by Bertrand Jeannet, but since it
# GNU-software, and to make the installation process smother, I have chosen
# to include them in this package.
#
#########################################################################
# Where to install bins, libs, and include files
BIN_INSTALL_DIR = $(LURETTE_PATH)/$(HOST_TYPE)/bin
LIB_INSTALL_DIR = $(LURETTE_PATH)/$(HOST_TYPE)/lib
INC_INSTALL_DIR = $(LURETTE_PATH)/$(HOST_TYPE)/include
INCDIRS = $(LURETTE_PATH)/$(HOST_TYPE)/lib /home/jahier/lib
LIBDIRS = $(LURETTE_PATH)/$(HOST_TYPE)/lib /home/jahier/lib
# OCAML tools
OCAMLC = ocamlc.opt
OCAMLOPT = ocamlopt.opt
OCAMLDEP = ocamldep
OCAMLLIB = /home/jahier/lib/ocaml
OCAMLBEST = opt
OCAMLVERSION = 3.06
CAMLIDL = camlidl
all: Cuddaux Mlcuddidl Lucky-and-co Xlurette
Lucky-and-co:
cd source; make install
Cuddaux:
cd cuddaux ; make install
Mlcuddidl:
cd mlcuddidl ; make install
Xlurette:
cd ihm/xlurette ; make install
-include ../.$(HOSTTYPE)/Makefile.common
-include ../user-rules
......@@ -5,10 +5,9 @@
# Where to find libs
INCDIRS = /home/jahier/$(HOSTTYPE)/lib
LIBDIRS = /home/jahier/$(HOSTTYPE)/lib
INCDIRS = /home/jahier/$(HOST_TYPE)/lib
LIBDIRS = /home/jahier/$(HOST_TYPE)/lib
HOST_TYPE=i386-linux
OCAMLMAKEFILE = /home/jahier/lurette/OcamlMakefile
LURETTE_PATH = /home/jahier/lurette
......
The LUCKY package
The LURETTE V2 package
* WHAT IS IT?
The lucky package is a set of tools that let one test and simulate
reactive programs (e.g., written in lustre). The heart of it made of
an engine that draws (boolean, integers and real) values according to
a non-deterministic specification.
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:
......@@ -16,64 +17,59 @@ 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.
lurettetop:
lurettetop is a top level loop that let one test
reactive programs written in lustre.
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 can be useful either if xlurette is broken
or if (like me) your are not a GUI-clickodrom fan.
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.
More information is available in the doc/lutin.pdf file.
lucky:
Previous tools use a descrition a the environement
contained in a .luc files.
show_luc:
This program lets you vizualise .luc files offline.
-o-
* WHAT IS NEEDED?
For lurettetop and xlurette, you need:
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.
(a) An ocaml compiler (version 3.06):
http://caml.inria.fr/
show_luc:
This program lets you vizualise lucky (.luc) files offline.
It is also called automatically from xlurette and lurettetop.
(b) The CamlIDL stub code generator (version 1.04):
http://caml.inria.fr/camlidl/
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.
For show_luc (and hence for the other tools since the can use show_luc),
you need:
(a) gv (for post-script viewing)
(b) dot (for graph drawing)
Also cf the tool section at the url http://www-verimag.imag.fr/~synchron/
-o-
* BINARY VERSION INSTALLATION
Here is what you need to do to install and use those tools.
$ tar xvfz lurette-XXX.tgz
* INSTALLATION
$ tar xvfz luretteV2-XXX.tgz
$ cd lurette-XXX
$ ./INSTALL
$ source lucky_init.sh
# or "source lucky_init.csh" if you are using csh
# also, you may wish to put that statement in your .bashrc ot something
$ make install
# if you wish to install tools anywhere else than lurette-XXX/os_type/{bin,lib}
-o-
* Authors
Erwan Jahier
Pascal Raymond
Yvan Roux
......
......@@ -5,7 +5,6 @@
*********** A faire maintenant
* Utiliser l'ordre des parametres plutot que leur noms
Quoique, quand on fait le produit de plusieurs automates,
ca n'est guere pratique...
......@@ -75,9 +74,6 @@ la verif de type en meme temps que le parsing ->
-> #test_failure
* Finir le fichier README. Faire un fichier INSTALL.
* utiliser Unix.create_process plutot que Sys.command partout !!
......
......@@ -15,15 +15,15 @@ SRCDIR = $(shell pwd)
CUDD_INSTALL = /home/jahier/$(HOSTTYPE)
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := ~/$(HOSTTYPE)/bin
BIN_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/bin
endif
ifndef INC_INSTALL_DIR
INC_INSTALL_DIR := ~/$(HOSTTYPE)/include
INC_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/include
endif
ifndef LIB_INSTALL_DIR
LIB_INSTALL_DIR := ~/$(HOSTTYPE)/lib
LIB_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/lib
endif
......
......@@ -19,7 +19,7 @@ xlurette: dummy
-I +lablgtk -I +str -o xlurette str.cma unix.cma lablgtk.cma gtkInit.cmo \
xlurette_glade_callbacks.cmo xlurette_glade_interface.cmo xlurette_glade_main.cmo
xlurette.opt: 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
......@@ -27,7 +27,7 @@ xlurette.opt: dummy
ocamlopt -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
xlurette.opt_opt: dummy
opt_opt: dummy
mlglade xlurette.glade
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
......
......@@ -84,7 +84,7 @@
<handler>show_env_button_clicked</handler>
<last_modification_time>Thu, 12 Sep 2002 08:23:10 GMT</last_modification_time>
</signal>
<label>Environment</label>
<label>Show Environment</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<left_attach>0</left_attach>
......@@ -466,7 +466,7 @@
<widget>
<class>GtkCombo</class>
<name>combo2</name>
<name>sut_node</name>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
......@@ -482,9 +482,14 @@
<widget>
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>sut_node</name>
<name>sut_node_entry</name>
<tooltip>Sut node name</tooltip>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>on_sut_node_changed</handler>
<last_modification_time>Fri, 18 Apr 2003 12:07:57 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
......@@ -564,7 +569,7 @@
<widget>
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>combo-entry3</name>
<name>oracle_node_entry</name>
<tooltip>Oracle node name</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
......@@ -750,7 +755,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>
......
......@@ -306,7 +306,7 @@ let _ = tooltips#set_tip ~text:"Name of the program under test" sut_name#coerce
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
let combo2 = GEdit.combo
let sut_node = GEdit.combo
~packing:(hbox13#pack ~padding:0
~fill:true
~expand:true
......@@ -317,13 +317,13 @@ let combo2 = GEdit.combo
~use_arrows:`DEFAULT
()
in
let sut_node = combo2#entry
let sut_node_entry = sut_node#entry
in
let _ = GtkBase.Widget.set_can_focus combo2#as_widget true in
let _ = tooltips#set_tip ~text:"Sut node name" combo2#coerce in
let _ = sut_node#set_editable true in
let _ = sut_node#set_visibility true in
let _ = sut_node#set_max_length 0 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 _ = sut_node_entry#set_editable true in
let _ = sut_node_entry#set_visibility true in
let _ = sut_node_entry#set_max_length 0 in
let hbox14 = GPack.hbox
~spacing:0
~homogeneous:false
......@@ -368,13 +368,13 @@ let oracle_node = GEdit.combo
~use_arrows:`DEFAULT
()
in
let combo_entry3 = oracle_node#entry
let oracle_node_entry = oracle_node#entry
in
let _ = GtkBase.Widget.set_can_focus oracle_node#as_widget true in
let _ = tooltips#set_tip ~text:"Oracle node name" oracle_node#coerce in
let _ = combo_entry3#set_editable true in
let _ = combo_entry3#set_visibility true in
let _ = combo_entry3#set_max_length 0 in
let _ = oracle_node_entry#set_editable true in
let _ = oracle_node_entry#set_visibility true in
let _ = oracle_node_entry#set_max_length 0 in
let env_name = GEdit.combo
~packing:(table2#attach ~left:1
~top:1
......@@ -462,7 +462,7 @@ let button20 = toolbar4#insert_button
in
let _ = tooltips#set_tip ~text:"Stop the current run" button20#coerce in
let button36 = toolbar4#insert_button
~text: " "
~text: " "
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/close.xpm" ()) ())#coerce
()
in
......@@ -1208,6 +1208,19 @@ let delete_rif_button = toolbar8#insert_button
()
in
let _ = tooltips#set_tip ~text:"Delete selected file" delete_rif_button#coerce in
let label27 = GMisc.label
~text: "This page does not work yet, sorry"
~packing:(vbox15#pack ~padding:0
~fill:false
~expand:true
)
~xalign:0.5
~yalign:0.5
~xpad:0
~ypad:0
~line_wrap:false
()
in
let time_diagrams_label = GMisc.label
~text: "Timing diagrams"
~xalign:0.5
......@@ -1241,6 +1254,8 @@ let _ = button17#connect#clicked
~callback:callbacks#run_lurette in
let _ = oracle_name_entry#connect#changed
~callback:callbacks#on_oracle_name_changed in
let _ = sut_node_entry#connect#changed
~callback:callbacks#on_sut_node_changed in
let _ = sut_name_entry#connect#changed
~callback:callbacks#on_sut_name_changed in
let _ = button33#connect#clicked
......@@ -1281,13 +1296,13 @@ method hbox13 = hbox13
method eventbox1 = eventbox1
method sut_name = sut_name
method sut_name_entry = sut_name
method combo2 = combo2
method sut_node = combo2
method sut_node = sut_node
method sut_node_entry = sut_node
method hbox14 = hbox14
method oracle_name = oracle_name
method oracle_name_entry = oracle_name
method oracle_node = oracle_node
method combo_entry3 = oracle_node
method oracle_node_entry = oracle_node
method env_name = env_name
method env_name_entry = env_name
method scrolledwindow2 = scrolledwindow2
......@@ -1358,6 +1373,7 @@ method vbox15 = vbox15
method toolbar8 = toolbar8
method sim2chro = sim2chro
method delete_rif_button = delete_rif_button
method label27 = label27
method time_diagrams_label = time_diagrams_label
initializer callbacks#set_xlurette self;
notebook1#prepend_page
......
......@@ -40,6 +40,7 @@ let ok_str = " OK!
(**************************************************************************)
let pre_sut_node = ref ""
let (remove_extension : string -> string) =
fun str ->
......@@ -485,8 +486,8 @@ class customized_callbacks = object(self)
then "set_show_step true \n"
else "set_show_step false \n"
in
cmd_oracle ^ cmd_test_length ^ cmd_formula_nb ^ cmd_draw_nb
^ cmd_rif_file ^ cmd_env ^ cmd_sut ^ cmd_step ^ cmd_seed
cmd_test_length ^ cmd_formula_nb ^ cmd_draw_nb
^ cmd_rif_file ^ cmd_sut ^ cmd_env ^ cmd_oracle ^ cmd_step ^ cmd_seed
^ cmd_draw_mode ^ cmd_call_sim2chro ^ cmd_display_local
^ cmd_verbose ^ cmd_show_step
......@@ -494,21 +495,55 @@ class customized_callbacks = object(self)
method on_sut_name_changed () =
let sut = self#top_xlurette#sut_name#entry#text in
if
sut <> ""
sut = ""
then
(
let nodes = (lusinfo self#top_xlurette#sut_name#entry#text) in
if nodes <> [] then self#top_xlurette#sut_node#set_popdown_strings nodes
self#top_xlurette#sut_node#entry#set_text "";
self#top_xlurette#env_name_entry#entry#set_text ""
)
else