Commit fe6d609c authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.136 Mon, 19 May 2003 11:40:43 +0200 by jahier

Parent-Version:      0.135
Version-Log:

source/parse_env.ml:
source/formula.ml:
source/formula.mli:
source/env_state.ml:
source/env_state.mli:
source/automata.ml:
   Change the format of pragma to stick with how they are defined
   in the DC ref man.

   Also take into account programs that were added by yvan that
   let one know which control point in the source lutin program
   each lucky node correspond to.

source/lurette.ml:
   Display a better error msg when the sut and env vars do not match.

source/sim2chro.ml:
   Variables were not display in the same order as in their declaration
   (bug introduced in the previous change).

source/lurettetop.ml:
   The clean command does not remove everything in the tmp dir but only
   the generated files.

ihm/xlurette/xlurette_*.ml:
   The naming of rif files was not working properly.

   Add a clean-up button.

user-rules:
<various other makefiles>:
   Abstract away a few hard-code env var so that its works on cygwin

Project-Description: Lurette
parent 124c55f1
......@@ -2,12 +2,12 @@
;; 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 18915 1051024737 35_util.ml 1.45)
(source/util.ml 19131 1053337243 35_util.ml 1.46)
(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 6007 1052229068 d/22_TODO 1.14)
(TODO 6322 1053337243 d/22_TODO 1.15)
(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)
......@@ -15,21 +15,19 @@
(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 2804 1052229068 c/16_makefile 1.11)
(ihm/xlurette/makefile 3737 1053337243 c/16_makefile 1.12)
(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/cudd_gc_problem.rif.exp 7882 1053337243 e/30_cudd_gc_pr 1.2)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(share/lucky_init.sh.in 419 1051024737 e/24_lucky_init 1.3)
(mlcuddidl/idd_caml.c 15964 1034006019 c/50_idd_caml.c 1.1)
(share/lucky_init.sh.in 419 1053337243 e/24_lucky_init 1.4)
(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 2684 1052229068 b/41_Makefile.i 1.19)
(polka/README 1437 1047029868 e/19_README 1.1)
(source/Makefile.lucky 2694 1053337243 b/41_Makefile.i 1.20)
(polka/Makefile.depend 136 1047029868 d/30_Makefile.d 1.1)
(polka/README 1437 1047029868 e/19_README 1.1)
(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)
......@@ -40,7 +38,7 @@
(polka/C/cherni.c 28811 1047029868 e/9_cherni.c 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)
(source/formula.mli 2967 1053337243 44_formula.ml 1.23)
(polka/C/cherni.h 2217 1047029868 e/1_cherni.h 1.1)
(polka/caml/polka_caml.c 6499 1047029868 d/37_polka_caml 1.1)
(test/losange-3d.luc 555 1046768487 d/28_losange-3d 1.2)
......@@ -58,24 +56,23 @@
(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 30749 1052229068 c/12_xlurette_g 1.19)
(ihm/xlurette/xlurette_glade_main.ml 31329 1053337243 c/12_xlurette_g 1.20)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 55996 1052229068 c/13_xlurette.g 1.14)
(mlcuddidl/manager_caml.c 39233 1034006019 c/45_manager_ca 1.1)
(ihm/xlurette/xlurette.glade 56573 1053337243 c/13_xlurette.g 1.15)
(test/losange.luc 410 1046768487 d/27_losange.lu 1.2)
(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)
(test/gyro.rif.exp 10946 1053337243 e/36_gyro.rif.e 1.2)
(test/time-ecrins.exp 8227 1053337243 d/21_time-ecrin 1.18)
(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)
(source/formula.ml 6028 1053337243 45_formula.ml 1.29)
(source/Makefile.gen_fake_lutin 255 1050578564 d/17_Makefile.g 1.2)
(Makefile.common.source 242 1051024737 e/33_Makefile.c 1.2)
(Makefile.common.source 222 1053337243 e/33_Makefile.c 1.3)
(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)
(source/parse_env.mli 1196 1050421093 40_parse_env. 1.14)
(source/env_state.ml 22975 1050578564 51_env_state. 1.42)
(source/env_state.ml 23648 1053337243 51_env_state. 1.43)
(polka/caml/matrix.idl 5301 1047029868 d/34_matrix.idl 1.1)
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
(source/Makefile.lurettetop 375 1050578564 d/14_Makefile.l 1.3)
......@@ -85,7 +82,7 @@
(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 2397 1052229068 c/2_Makefile.l 1.19)
(source/Makefile.lurette_lib 2392 1053337243 c/2_Makefile.l 1.20)
(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)
......@@ -94,7 +91,7 @@
(polka/caml/vector.idl 8669 1047029868 d/35_vector.idl 1.1)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(source/sim2chro.mli 1545 1052229068 b/23_sim2chro.m 1.7)
(share/lucky_init.csh.in 420 1051024737 e/23_lucky_init 1.3)
(share/lucky_init.csh.in 419 1053337243 e/23_lucky_init 1.4)
(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)
......@@ -105,39 +102,39 @@
(source/store.ml 31409 1050421093 b/27_rnumsolver 1.24)
(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/ne.ml 9591 1053337243 c/21_ne.ml 1.8)
(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 783 1052229068 b/38_Makefile.l 1.22)
(source/parse_env.ml 42920 1053337243 41_parse_env. 1.44)
(share/Makefile.lurette.in 777 1053337243 b/38_Makefile.l 1.23)
(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 1052229068 b/49_time.res 1.43)
(source/automata.ml 19223 1046682069 b/47_automata.m 1.7)
(test/time-ossau.res 8239 1053337243 b/49_time.res 1.44)
(source/automata.ml 19521 1053337243 b/47_automata.m 1.8)
(Makefile 68 1051024737 d/13_Makefile 1.4)
(cuddaux/cuddauxBridge.c 6099 1034006019 c/31_cuddauxBri 1.1)
(test/heater_float.rif.exp 1040 1052229068 b/30_heater_flo 1.14)
(cuddaux/Makefile 3344 1052229068 c/35_Makefile 1.6)
(test/heater_float.rif.exp 1040 1053337243 b/30_heater_flo 1.15)
(cuddaux/Makefile 3326 1053337243 c/35_Makefile 1.7)
(polka/C/bit.c 3026 1047029868 e/10_bit.c 1.1)
(test/time-ossau.exp 8238 1052229068 b/48_time.exp 1.40)
(source/print.ml 5787 1045558187 47_print.ml 1.22)
(test/time-ossau.exp 8239 1053337243 b/48_time.exp 1.41)
(source/print.ml 5794 1053337243 47_print.ml 1.23)
(mlcuddidl/macros.m4 11290 1034006019 c/49_macros.m4 1.1)
(polka/caml/polkaIO.ml 1652 1047029868 d/44_polkaIO.ml 1.1)
(test/heater_int.rif.exp 812 1052229068 b/28_heater_int 1.12)
(test/heater_int.rif.exp 812 1053337243 b/28_heater_int 1.13)
(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 33461 1052229068 c/1_lurettetop 1.32)
(source/lurettetop.ml 33530 1053337243 c/1_lurettetop 1.33)
(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)
(polka/caml/Makefile.depend 0 1053337243 d/32_Makefile.d 1.2)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 37539 1052229068 c/15_xlurette_g 1.13)
(ihm/xlurette/xlurette_glade_interface.ml 38030 1053337243 c/15_xlurette_g 1.14)
(test/losange-3d2.luc 368 1050421093 e/32_losange-3d 1.1)
(test/Makefile 26 1051024737 c/0_Makefile 1.12)
(user-rules 20654 1052229068 c/14_myrules 1.33)
(user-rules 21186 1053337243 c/14_myrules 1.34)
(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)
......@@ -145,15 +142,14 @@
(mlcuddidl/cudd_caml.h 1210 1034006019 d/2_cudd_caml. 1.1)
(source/show_env.ml 3642 1037192189 43_show_env.m 1.16)
(polka/C/essai.c 1001 1047029868 e/11_essai.c 1.1)
(mlcuddidl/rdd_caml.c 41613 1034006019 c/39_rdd_caml.c 1.1)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(mlcuddidl/rdd.idl 14806 1034006019 c/42_rdd.idl 1.1)
(polka/sedscript 261 1047029868 d/31_sedscript 1.1)
(OcamlMakefile 22837 1050578564 17_OcamlMakef 1.49)
(OcamlMakefile 22849 1053337243 17_OcamlMakef 1.50)
(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 2683 1052229068 d/11_configure. 1.6)
(share/configure.in 2738 1053337243 d/11_configure. 1.7)
(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 189 1052229068 d/12_Makefile.c 1.5)
......@@ -162,8 +158,8 @@
(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 1052229068 b/29_Controleur 1.14)
(source/env_state.mli 7269 1053337243 50_env_state. 1.30)
(test/ControleurPorte.rif.exp 4676 1053337243 b/29_Controleur 1.15)
(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)
......@@ -174,7 +170,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 744 1052229068 b/51_temp_float 1.7)
(test/temp_float.luc 731 1053337243 b/51_temp_float 1.8)
(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)
......@@ -182,21 +178,21 @@
(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 8235 1052229068 d/20_time-ecrin 1.17)
(test/time-ecrins.res 8227 1053337243 d/20_time-ecrin 1.18)
(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 7458 1052229068 c/20_Makefile 1.15)
(polka/Makefile.config 1683 1053337243 e/20_Makefile.c 1.5)
(source/Makefile 7037 1053337243 c/20_Makefile 1.16)
(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)
(test/losange-3d.rif.exp 2676 1053337243 e/31_losange-3d 1.2)
(polka/documentation/Makefile 476 1047029868 e/18_Makefile 1.1)
(source/sim2chro.ml 2944 1052229068 b/24_sim2chro.m 1.16)
(source/sim2chro.ml 2949 1053337243 b/24_sim2chro.m 1.17)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
(source/luc_exe.ml 14047 1052229068 b/32_ima_exe.ml 1.31)
(source/luc_exe.ml 14073 1053337243 b/32_ima_exe.ml 1.32)
(source/gne.mli 1557 1046682069 b/36_gne.mli 1.5)
(source/lurette.ml 17856 1052229068 12_lurette.ml 1.68)
(source/lurette.ml 18378 1053337243 12_lurette.ml 1.69)
(polka/C/Makefile.depend 1081 1047029868 d/46_Makefile.d 1.1)
(doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
(cuddaux/cuddauxCompose.c 13638 1034006019 c/30_cuddauxCom 1.1)
......@@ -207,4 +203,4 @@
(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 7412 1052229068 d/9_Makefile 1.6)
(mlcuddidl/Makefile 7387 1053337243 d/9_Makefile 1.7)
......@@ -5,10 +5,10 @@
# Where to find libs
INCDIRS = /home/jahier/$(HOST_TYPE)/lib
LIBDIRS = /home/jahier/$(HOST_TYPE)/lib
INCDIRS = $(HOME)/$(HOST_TYPE)/lib
LIBDIRS = $(HOME)/$(HOST_TYPE)/lib
OCAMLMAKEFILE = /home/jahier/lurette/OcamlMakefile
OCAMLMAKEFILE = $(HOME)/lurette/OcamlMakefile
LURETTE_PATH = /home/jahier/lurette
LURETTE_PATH = $(HOME)/lurette
......@@ -5,7 +5,7 @@
# For updates see:
# http://www.oefai.at/~markus/ocaml_sources
#
# $Id: OcamlMakefile 1.49 Thu, 17 Apr 2003 13:22:44 +0200 jahier $
# $Id: OcamlMakefile 1.50 Mon, 19 May 2003 11:40:43 +0200 jahier $
#
###########################################################################
......@@ -172,13 +172,13 @@ NCRESULT := $(addsuffix $(NCSUFFIX), $(RESULT))
TOPRESULT := $(addsuffix $(TOPSUFFIX), $(RESULT))
ifndef OCAMLC
OCAMLC := ocamlc
OCAMLC := ocamlc.opt
endif
export OCAMLC
ifndef OCAMLOPT
OCAMLOPT := ocamlopt
OCAMLOPT := ocamlopt.opt
endif
export OCAMLOPT
......@@ -238,7 +238,7 @@ endif
export CAMLP4
ifndef OCAMLDOC
OCAMLDOC := ocamldoc
OCAMLDOC := ocamldoc.opt
endif
export OCAMLDOC
......
*********** BUGS
* Attention, les gens ne peuvent pas appeler leur variables ok !!!
* Quand on modifie le .lus, je ne recompile pas tout ce qu'il semble t'il ??
*********** 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 ...
* Si l'execution se termine normalement (ie, a la fin de l'expression
reguliere), changer le message d'erreur.
* mettre qques part que j'utilise ocaml, camlidl cuddaux, mlcuddidl,
polka, gmp,autoconf, make, gcc, emacs, latex, dot, gtk, sim2chro, ...
* Mettre les .c generes dans share
* lurettetop :utilise Filename.temp_file pour creer un repertoire temporaire
pour lurette.
......@@ -26,8 +37,6 @@ la verif de type en meme temps que le parsing ->
(1) Portage pour scade et esterel windows ...
-> structure, tableau, types structures, etc.
* le losange ne passe pas avec polkai et passe avec polkag.
Regarder pourquoi et dire à Bertrand
(2) Traiter les variables stables (signaux purs)
......@@ -38,6 +47,10 @@ la verif de type en meme temps que le parsing ->
(2) Faire une doc utilisateur pour lurette (moins urgent depuis qu'il y
a lurettetop et xlurette...)
* le losange ne passe pas avec polkai et passe avec polkag.
Regarder pourquoi et dire à Bertrand
* Inferer la croix, plutot que de verifier !!!
* La notion d'epaisseur est mal branlée, surtout en presence de var
......@@ -89,7 +102,7 @@ la verif de type en meme temps que le parsing ->
* Chercher a detecter des egalites lors de l'ajout d'une inegalité.
(cf code commenter dans store.ml)
(cf code commenté dans store.ml)
* xlurette :
- bouton sim2chro ; mettre les locales en vert -> pragma dans sim2chro !!
......
......@@ -12,18 +12,20 @@ SRCDIR = $(shell pwd)
#
# XXX autoconf
CUDD_INSTALL = /home/jahier/$(HOSTTYPE)
CUDD_INSTALL = $(HOME)/$(HOSTTYPE)
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/bin
BIN_INSTALL_DIR := $(HOME)/$(HOSTTYPE)/bin
endif
ifndef INC_INSTALL_DIR
INC_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/include
INC_INSTALL_DIR := $(HOME)/$(HOSTTYPE)/include
endif
ifndef LIB_INSTALL_DIR
LIB_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/lib
LIB_INSTALL_DIR := $(HOME)/$(HOSTTYPE)/lib
endif
......
......@@ -30,9 +30,37 @@ 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/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -verbose -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -verbose -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
try: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"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
cyg: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//(Filename.concat (Unix.getenv \"LURETTE_PATH\") (Filename.concat \"share\" (Filename.concat \"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
......@@ -52,9 +80,6 @@ opt_opt: dummy
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
......
......@@ -626,7 +626,7 @@
<widget>
<class>GtkScrolledWindow</class>
<name>scrolledwindow2</name>
<name>scrolled_output_window</name>
<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
......@@ -643,7 +643,7 @@
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<editable>False</editable>
<editable>True</editable>
<text></text>
</widget>
</widget>
......@@ -750,7 +750,24 @@
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>button36</name>
<name>clean_up_button</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Clean-up intermediary files (to try when xlurette seems to be broken)</tooltip>
<signal>
<name>clicked</name>
<handler>on_clean_up_button_clicked</handler>
<last_modification_time>Fri, 16 May 2003 14:18:29 GMT</last_modification_time>
</signal>
<label> </label>
<icon>clean-up.xpm</icon>
</widget>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>button38</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
......
......@@ -404,16 +404,16 @@ let _ = tooltips#set_tip ~text:"Environment file name: its input (resp output) v
let _ = env_name_entry#set_editable true in
let _ = env_name_entry#set_visibility true in
let _ = env_name_entry#set_max_length 0 in
let scrolledwindow2 = GBin.scrolled_window
let scrolled_output_window = GBin.scrolled_window
~hpolicy:`AUTOMATIC
~vpolicy:`AUTOMATIC
~packing:(vpaned2#add )
()
in
let output_window = GEdit.text
~packing:scrolledwindow2#add
~packing:scrolled_output_window#add
~height:300
~editable:false
~editable:true
()
in
......@@ -466,12 +466,18 @@ let button20 = toolbar4#insert_button
()
in
let _ = tooltips#set_tip ~text:"Stop the current run" button20#coerce in
let button36 = toolbar4#insert_button
let clean_up_button = toolbar4#insert_button
~text: " "
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "LURETTE_PATH") ^ "/share/pixmaps/" ^ "clean-up.xpm") ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Clean-up intermediary files (to try when xlurette seems to be broken)" clean_up_button#coerce in
let button38 = toolbar4#insert_button
~text: " "
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "LURETTE_PATH") ^ "/share/pixmaps/" ^ "close.xpm") ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Quit xlurette" button36#coerce in
let _ = tooltips#set_tip ~text:"Quit xlurette" button38#coerce in
let label9 = GMisc.label
~text: "Run "
~xalign:0.5
......@@ -1247,8 +1253,10 @@ let _ = button14#connect#clicked
~callback:callbacks#call_sim2chro_clicked in
let _ = button2#connect#clicked
~callback:callbacks#save_session in
let _ = button36#connect#clicked
let _ = button38#connect#clicked
~callback:callbacks#quit in
let _ = clean_up_button#connect#clicked
~callback:callbacks#on_clean_up_button_clicked in
let _ = button20#connect#clicked
~callback:callbacks#stop_run in
let _ = button19#connect#clicked
......@@ -1310,7 +1318,7 @@ method oracle_node = oracle_node
method oracle_node_entry = oracle_node
method env_name = env_name
method env_name_entry = env_name
method scrolledwindow2 = scrolledwindow2
method scrolled_output_window = scrolled_output_window
method output_window = output_window
method hbox1 = hbox1
method toolbar4 = toolbar4
......@@ -1318,7 +1326,8 @@ method button17 = button17
method button18 = button18
method button19 = button19
method button20 = button20
method button36 = button36
method clean_up_button = clean_up_button
method button38 = button38
method label9 = label9
method option_panel = option_panel
method vbox8 = vbox8
......
......@@ -4,12 +4,13 @@ open GtkEdit
open GtkList
let debug =
(* true *)
false
(* true *)
false
let pid = ref 0
let lpid = ref 0
let rif_file = ref ""
(* Flag telling if any saved package need to be restored *)
let restore = ref false
......@@ -36,6 +37,7 @@ type tok = Genlex.token Stream.t
let ok_str = " OK!
"
(**************************************************************************)
let (give_fresh_file_name : string -> string -> string) =
......@@ -44,16 +46,15 @@ let (give_fresh_file_name : string -> string -> string) =
fun i ->
let file = (prefix ^ (string_of_int i) ^ suffix) in
if
not (Sys.file_exists file)
Sys.file_exists file
then
file
else
give_fresh_file_name_aux (i+1)
else
file
in
give_fresh_file_name_aux 1
let rif_file = ref ""
let get_rif_file _ = !rif_file
......@@ -153,14 +154,19 @@ let (lusinfo : string -> string list) =
in
let cmd = ("lusinfo " ^ file_lus ^ " nodes > " ^ file_info) in
let _ =
if Sys.file_exists file_info then Sys.remove file_info;
if
((Sys.command cmd) <> 0)
then
Sys.file_exists file_lus
then
(
output_string stdout ("*** lusinfo failed.\n" ^ cmd ^ "\n");
flush stdout
)
if Sys.file_exists file_info then Sys.remove file_info;
if
((Sys.command cmd) <> 0)
then
(
output_string stdout ("*** lusinfo failed.\n" ^ cmd ^ "\n");
flush stdout
)
);
in
let ic = open_in file_info in
let nodes = readfile_line ic [] in
......@@ -291,7 +297,13 @@ class customized_callbacks = object(self)
method show_step_window () =
self#top_step_by_step_window#step_by_step_window#show ()
method on_clean_up_button_clicked () =
output_string oc ("clean \n");
flush oc;
prerr_endline "Clean-up temporary files ...";
()
(* sut file selection window *)
method browse_sut_clicked () =
......@@ -426,7 +438,9 @@ class customized_callbacks = object(self)
method call_sim2chro_clicked () =
let cmd_display =
("set_output " ^ (get_rif_file ()) ^ "\n" ^ "sim2chro\n") in
if (get_rif_file ()) = "" then "" else
("set_output \"" ^ (get_rif_file ()) ^ "\"\n" ^ "sim2chro\n")
in
output_string oc cmd_display ;
if debug then output_string stderr cmd_display;
......@@ -458,7 +472,7 @@ class customized_callbacks = object(self)
let rif_file = (get_rif_file ()) in
let cmd_rif_file =
if rif_file = "" then "" else ("set_output " ^ rif_file ^ "\n")
if rif_file = "" then "" else ("set_output \"" ^ rif_file ^ "\"\n")
in
let cmd_step =
......@@ -633,8 +647,8 @@ class customized_callbacks = object(self)
update_rif_file_name
self#top_xlurette#rif_file_basename#text
(remove_extension self#top_xlurette#sut_name#entry#text)
(remove_extension self#top_xlurette#env_name#entry#text)
(remove_extension self#top_xlurette#sut_name_entry#entry#text)
(remove_extension self#top_xlurette#env_name_entry#entry#text)
self#top_xlurette#test_length#text ;
......@@ -659,6 +673,8 @@ class customized_callbacks = object(self)
self#top_xlurette#output_window#insert msg