Commit 45dee352 authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.140 Mon, 23 Jun 2003 15:19:23 +0200 by jahier

Parent-Version:      0.139
Version-Log:

ihm/xlurette/xlurette_main.ml:
   Change the current dir when the sut changes so that the current dir is the
   dir of the sut.

source/lurettetop.ml:
   Add a change_dir command.

   Make user_dir and tmp_lurette global vars.

share/configure.in:
   create .bat and sh scripts take set env vars and run tools
   (xlurette and lurettetop) so that sourcing lucky_init.cs is
   no longer necessary.

Project-Description: Lurette
parent 445b2ff0
......@@ -2,13 +2,13 @@
;; 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 23316 1055926783 35_util.ml 1.49)
(source/util.ml 23531 1056374363 35_util.ml 1.50)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(test/cygwin-scade/lib_pilot.vsp 1433 1055926783 f/47_lib_pilot. 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 6565 1055926783 d/22_TODO 1.18)
(TODO 5249 1056374363 d/22_TODO 1.19)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/ne.mli 2138 1050421093 c/22_ne.mli 1.6)
(share/config.guess 39153 1055926783 f/25_config.gue 1.1)
......@@ -20,14 +20,14 @@
(share/pixmaps/open.xpm 782 1055926783 f/17_open.xpm 1.1)
(polka/C/internal.c 699 1047029868 e/8_internal.c 1.1)
(source/solver.ml 30978 1055487917 39_solver.ml 1.48)
(ihm/xlurette/makefile 1740 1055926783 c/16_makefile 1.15)
(ihm/xlurette/makefile 1825 1056374363 c/16_makefile 1.16)
(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 7882 1053337243 e/30_cudd_gc_pr 1.2)
(test/sparc-scade/libpwlinear.saofdm 1379 1055487917 e/43_libpwlinea 1.1)
(test/cygwin-scade/ConfAnnot.aty 13661 1055926783 g/4_ConfAnnot. 1.1)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(share/lucky_init.sh.in 727 1055926783 e/24_lucky_init 1.7)
(share/lucky_init.sh.in 731 1056374363 e/24_lucky_init 1.8)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(source/gen_stubs_common.ml 6381 1055487917 e/39_gen_stubs_ 1.1)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
......@@ -37,7 +37,7 @@
(source/Makefile.lucky 2699 1054647149 b/41_Makefile.i 1.21)
(polka/README 1437 1047029868 e/19_README 1.1)
(polka/Makefile.depend 136 1047029868 d/30_Makefile.d 1.1)
(README 2266 1052229068 10_README 1.9)
(README 2803 1056374363 10_README 1.10)
(source/pnumsolver.ml 9273 1045489850 d/23_pnumsolver 1.2)
(source/gen_stubs_scade.ml 9106 1055926783 f/5_gen_stubs_ 1.1)
(source/polyhedron.ml 7661 1049961831 d/25_polyhedron 1.5)
......@@ -54,7 +54,7 @@
(polka/caml/polka_caml.c 6499 1047029868 d/37_polka_caml 1.1)
(source/gen_stubs_poc.mli 636 1055926783 f/4_gen_stubs_ 1.1)
(test/losange-3d.luc 555 1046768487 d/28_losange-3d 1.2)
(test/time-moucherotte.res 4408 1055926783 e/38_time-mouch 1.3)
(test/time-moucherotte.res 4417 1056374363 e/38_time-mouch 1.4)
(polka/caml/poly.idl 8449 1047029868 d/33_poly.idl 1.1)
(polka/documentation/texinfo.tex 200195 1047029868 e/16_texinfo.te 1.1)
(polka/caml/polka_caml.h 1922 1047029868 d/36_polka_caml 1.1)
......@@ -74,7 +74,7 @@
(polka/caml/Makefile 6559 1047029868 d/45_Makefile 1.1)
(test/cygwin-scade/det_mvt_mode.saofd 4184 1055926783 f/51_det_mvt_mo 1.1)
(test/cygwin-scade/test-scade-cygwin.res 0 1055926783 f/28_test-scade 1.1)
(ihm/xlurette/xlurette_glade_main.ml 39689 1055926783 c/12_xlurette_g 1.23)
(ihm/xlurette/xlurette_glade_main.ml 40723 1056374363 c/12_xlurette_g 1.24)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(test/cygwin-scade/det_mvt_mode_env.lut 333 1055926783 f/32_det_mvt_mo 1.1)
......@@ -84,7 +84,7 @@
(test/cygwin-scade/lib_pilot.err 119 1055926783 f/49_lib_pilot. 1.1)
(test/losange.luc 410 1046768487 d/27_losange.lu 1.2)
(test/gyro.rif.exp 10946 1053337243 e/36_gyro.rif.e 1.2)
(test/time-ecrins.exp 8238 1055926783 d/21_time-ecrin 1.21)
(test/time-ecrins.exp 8229 1056374363 d/21_time-ecrin 1.22)
(source/value.ml 2358 1049961831 c/23_value.ml 1.4)
(source/gne.ml 2774 1046682069 b/37_gne.ml 1.5)
(test/cygwin-scade/Pilot.vsp 2075 1055926783 f/40_Pilot.vsp 1.1)
......@@ -152,7 +152,7 @@
(share/Makefile.lurette.in 4415 1055926783 b/38_Makefile.l 1.25)
(source/graph.mli 2185 1037625990 13_graph.mli 1.10)
(source/store.mli 2891 1046074449 b/26_rnumsolver 1.16)
(test/time-ossau.res 8239 1055926783 b/49_time.res 1.47)
(test/time-ossau.res 8230 1056374363 b/49_time.res 1.48)
(source/automata.ml 19517 1055487917 b/47_automata.m 1.9)
(test/sparc-scade/libmath.saofdm 1378 1055487917 e/45_libmath.sa 1.1)
(Makefile 68 1051024737 d/13_Makefile 1.4)
......@@ -163,7 +163,7 @@
(cuddaux/Makefile 3326 1053337243 c/35_Makefile 1.7)
(polka/C/bit.c 3026 1047029868 e/10_bit.c 1.1)
(source/draw.mli 467 1055926783 f/1_draw.mli 1.1)
(test/time-ossau.exp 8239 1055926783 b/48_time.exp 1.44)
(test/time-ossau.exp 8230 1056374363 b/48_time.exp 1.45)
(polka/caml/polkaIO.ml 1652 1047029868 d/44_polkaIO.ml 1.1)
(mlcuddidl/macros.m4 11290 1034006019 c/49_macros.m4 1.1)
(source/print.ml 5794 1053337243 47_print.ml 1.23)
......@@ -178,7 +178,7 @@
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
(source/lurettetop.ml 43776 1055926783 c/1_lurettetop 1.36)
(source/lurettetop.ml 44125 1056374363 c/1_lurettetop 1.37)
(source/constraint.ml 2762 1050421093 c/19_constraint 1.7)
(test/cygwin-scade/counter.saofd 587 1055926783 g/2_counter.sa 1.1)
(polka/caml/Makefile.depend 0 1053337243 d/32_Makefile.d 1.2)
......@@ -188,7 +188,7 @@
(test/cygwin-scade/MyConsts.saofd 153 1055926783 f/44_MyConsts.s 1.1)
(test/losange-3d2.luc 368 1050421093 e/32_losange-3d 1.1)
(test/Makefile 26 1051024737 c/0_Makefile 1.12)
(user-rules 24224 1055926783 c/14_myrules 1.37)
(user-rules 24733 1056374363 c/14_myrules 1.38)
(mlcuddidl/cudd_caml.c 22890 1034006019 d/3_cudd_caml. 1.1)
(polka/C/config.h 77 1047029868 e/13_config.h 1.1)
(test/usager.luc 508 1046682069 b/14_usager.env 1.11)
......@@ -208,14 +208,14 @@
(share/pixmaps/halt.xpm 511 1055926783 f/18_halt.xpm 1.1)
(polka/C/matrix.c 19090 1047029868 e/7_matrix.c 1.1)
(mlcuddidl/rdd.ml 8746 1034006019 c/41_rdd.ml 1.1)
(share/configure.in 7145 1055926783 d/11_configure. 1.9)
(share/configure.in 7688 1056374363 d/11_configure. 1.10)
(test/tram.luc 1092 1046682069 b/15_tram.env 1.10)
(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)
(polka/C/matrix.h 3461 1047029868 d/51_matrix.h 1.1)
(cuddaux/cuddaux.h 2381 1034006019 c/33_cuddaux.h 1.1)
(source/pnumsolver.mli 2322 1045489850 d/24_pnumsolver 1.2)
(share/lucky.el 1909 1055926783 f/7_lucky.el 1.1)
(share/lucky.el 1912 1056374363 f/7_lucky.el 1.2)
(mlcuddidl/sedscript 203 1034006019 c/38_sedscript 1.1)
(test/cygwin-scade/.lurette_rc 483 1055926783 f/29_.lurette_r 1.1)
(source/env_state.mli 7269 1053337243 50_env_state. 1.30)
......@@ -242,16 +242,16 @@
(polka/C/polka.h 1478 1047029868 d/50_polka.h 1.1)
(share/pixmaps/ediff-quit.xpm 494 1055926783 f/20_ediff-quit 1.1)
(test/cygwin-scade/Pilot.saofd 3645 1055926783 f/42_Pilot.saof 1.1)
(test/time-moucherotte.exp 4408 1055926783 e/37_time-mouch 1.3)
(test/time-moucherotte.exp 4417 1056374363 e/37_time-mouch 1.4)
(source/command_line_luc_exe.ml 3558 1055487917 b/33_command_li 1.15)
(source/lurette_exe.c 220 1050421093 e/27_lurette_ex 1.2)
(source/env.ml 7849 1050421093 16_env.ml 1.30)
(share/pixmaps/close.xpm 803 1055926783 f/21_close.xpm 1.1)
(test/time-ecrins.res 8238 1055926783 d/20_time-ecrin 1.21)
(test/time-ecrins.res 8229 1056374363 d/20_time-ecrin 1.22)
(source/value.mli 1100 1049961831 c/24_value.mli 1.2)
(polka/Makefile.config 1683 1053337243 e/20_Makefile.c 1.5)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 7013 1055926783 c/20_Makefile 1.19)
(source/Makefile 7026 1056374363 c/20_Makefile 1.20)
(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)
......
......@@ -36,7 +36,8 @@ lutin:
There are also tools which are used by the ones above that one might
want to use.
want to use (you probably need to source the $HOSTTYPE/lucky_init.sh
or $HOSTTYPE/lucky_init.csh to use them directly).
gen_fake_lutin:
generates a fake lutin file (from C files generated by the
......@@ -72,8 +73,19 @@ Also confere the tool section at the url http://www-verimag.imag.fr/~synchron/
Erwan Jahier
Pascal Raymond
Yvan Roux
Yvan Roux
Nicolas Halbwachs
-o-
* THANKS
Here is the list of gnu/open source tools that we used to develop
this software. Many thanks to everybody involved in the development
and maintenance of them:
o ocaml, camlidl by the ocaml INRIA team
o polka, cuddaux and mlcuddidl by B. Jeannet, IRISA
o sim2chro by Y. Rémond - Vérimag
o autoconf, make, emacs, latex, dot, gtk, ... by other gnu-riders
*********** BUGS
:-)
*********** A faire maintenant
* Nouvelle syntaxe pour lucky
- les noeuds sont des string
......@@ -57,9 +59,9 @@ Les transitions :
(1) Portage pour scade, esterel ...
-> structure, tableau, types structures, etc.
* compiler sim2chrogtk sous cygwin
(1) Portage Reluc
(2) Traiter les variables stables (signaux purs)
* compiler sim2chrogtk sous cygwin
(2) Faire une doc utilisateur pour lurette (moins urgent depuis qu'il y
......@@ -77,11 +79,6 @@ Les transitions :
--> 2 options : --var-order (default), --var-name
* Repasser a une notation infixée pour le format lucky. Ne pas faire
la verif de type en meme temps que le parsing ->
* le losange ne passe pas avec polkai et passe avec polkag.
Regarder pourquoi et dire à Bertrand
......@@ -91,15 +88,12 @@ la verif de type en meme temps que le parsing ->
numériques. Il faudrait un 3eme parametre sui dit le nombre
de tirage que l'on fait dans chaque polyedres.
* remplacer l'epaisseur de formules par un taux de couverture
-> 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 = ...)
* Faire un gestionnaire de sessions comme le propose Pascal
* Si jamais on a à faire a des polyedres trop gros, on pourrait
......@@ -124,10 +118,6 @@ la verif de type en meme temps que le parsing ->
-> #test_failure
* utiliser Unix.create_process plutot que Sys.command partout !!
* autoconf :
-> tester si gtk est la
......@@ -145,8 +135,6 @@ la verif de type en meme temps que le parsing ->
*********** Cosmétisme
* appeler lurette lurette_exe ???
* changer le nom du type formula en Formula.t (faire pareil partout)
ce qui devrait permettre d'enlever tout plein de <<open Formula>>
......@@ -175,15 +163,11 @@ la verif de type en meme temps que le parsing ->
*********** A faire
* LURETTE_PATH n'est peut-etre pas le bon nom. LUCKY_PATH ?
* Ecrire une baterie de test plus sérieux !
* Ecrire une batterie de test plus sérieuse !
* Ecrire un papier qui explique la transformation en automate.
* Gerer proprement les histoires d'évaluation numérique (en creant un
module numeric, qui, éventuellement, appelle du C) ??
* Réfléchir à une version d'un tireur sans bdd ou les choix seraient
effectués pendant le parcours de la formule (pas d'équité, mais bon) +
......@@ -200,17 +184,6 @@ la verif de type en meme temps que le parsing ->
* dans gne.ml, rajouter partout assertion <<is_a_partition>>
*********** Moins urgent
* Tout passer sous noweb ?
* Tirer partis des numeros de lignes (ou de caracteres) associés
aux formules quand lutin saura les générer. Pour cela, il faut
que le try rende également la formule utilisé (au moins en mode
--step-by-step).
* Reconnaitre les extensions des arguments du sut pour
éventuellement appeler lustre (ou esterel...) si nécessaire
***********************************************************************
*** ??? LIST
......@@ -219,15 +192,7 @@ la verif de type en meme temps que le parsing ->
* Rajouter un parametre q pour spécifier le nombre de tirage pour
chaque variable numérique ??
* Ajouter les options --use-big-int et --use-float (quoique ...)
* Ne pas lancer sim2chro avec un "... &" mais avec un fork et un exec.
* Faire un passage sur les champs de env_state
- remplacer le champ `var_names' par `in_var_names' `out_var_names' et
`loc_var_names'
- Enlever le champ `graph' qui n'est plus utilisé une fois les tables
construites.
......@@ -3,11 +3,11 @@
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := ../../$(HOST_TYPE)/bin
BIN_INSTALL_DIR := $(LURETTE_PATH)/$(HOST_TYPE)/bin
endif
ifeq ($(WIN32),cygwin)
EXE := .exe
EXE = .exe
else
EXE :=
endif
......@@ -41,18 +41,22 @@ opt: dummy
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$(EXE) unix.cmxa lablgtk.cmxa gtkInit.cmx \
ocamlopt.opt -verbose -I +lablgtk -I +str -labels -o xlurette$(EXE) str.cmxa unix.cmxa lablgtk.cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
all: opt cp
cp:
cp xlurette$(EXE) $(BIN_INSTALL_DIR)
cp:
ifeq ($(HOST_TYPE),cygwin)
cp xlurette.exe $(BIN_INSTALL_DIR)
else
cp xlurette $(BIN_INSTALL_DIR)
endif
clean:
rm -f *.cm* *.o a.out xlurette$(EXE) xlurette.opt$(EXE)
dummy:
......
......@@ -7,8 +7,8 @@ open GtkList
(* Global vars *)
let debug =
(* true *)
false
(* true *)
false
let pid = ref 0
let lpid = ref 0
......@@ -35,11 +35,28 @@ let _ =
set_binary_mode_in ec false;
set_binary_mode_out oc false;
(* XXX won't work under window$ *)
(* ; Unix.set_nonblock lurette_stdout_out *)
(* ; Unix.set_nonblock lurette_stdout_out *)
Unix.set_nonblock lurette_stdout_in;
Unix.set_nonblock lurette_stderr_in
let (cygpath_w2u : string -> string) =
(* From a windows path to a unix one *)
fun str0 ->
let str = String.escaped str0 in
try
let i0 = Str.search_forward (Str.regexp ":") str 0 in
let l = String.length str in
let str_head = String.sub str 0 i0 in
let str_tail = String.sub str (i0+1) (l-i0-1) in
let str_tail_new = Str.global_replace (Str.regexp "\\\\") "/" str_tail in
(* print_string ("str_head = " ^ str_head ^ "\n"); *)
(* print_string ("str_tail = " ^ str_tail ^ "\n"); *)
(* print_string ("str_tail_new = " ^ str_tail_new ^ "\n"); *)
("/cygdrive/" ^ str_head ^ str_tail_new)
with _ ->
output_string stderr ("cygpath_w2u " ^ str0 ^ " failed.\n");
str0
type draw_mode = Vertices | Edges | Inside
type tok = Genlex.token Stream.t
......@@ -132,7 +149,7 @@ let rec (readfile_line : in_channel -> string list -> string list) =
(** returns the list of nodes of a lustre or saofdm file *)
let (lusinfo : string -> string list) =
fun file ->
let file_info = Filename.temp_file file "nodes_info" in
let file_info = Filename.temp_file (Filename.basename file) "nodes_info" in
let file_lus = file in
let files =
try
......@@ -370,9 +387,30 @@ class customized_callbacks = object(self)
method browse_sut_clicked () =
self#top_fileselection_sut#fileselection_sut#show ()
method change_dir dir =
let cmd = ("change_dir \"" ^ (String.escaped dir) ^ "\"\n") in
if debug then (
(output_string stderr cmd);
flush stderr
);
output_string oc cmd;
flush oc;
Sys.chdir dir;
self#read_lustre_files ();
self#read_env_files ()
method ok_sut_clicked () =
let sut_file = self#top_fileselection_sut#fileselection_sut#get_filename in
self#top_xlurette#sut_name#entry#set_text sut_file ;
let sut_file = cygpath_w2u self#top_fileselection_sut#fileselection_sut#get_filename in
let dir = Filename.dirname sut_file
and basename = Filename.basename sut_file in
output_string stderr ("sut_file = " ^ sut_file ^ "\n");
output_string stderr ("dir = " ^ dir ^ "\n");
output_string stderr ("basename = " ^ basename ^ "\n");
flush stderr;
self#top_xlurette#sut_name#entry#set_text basename ;
self#change_dir dir;
self#top_fileselection_sut#fileselection_sut#misc#hide ()
method cancel_sut_clicked () =
......@@ -665,35 +703,15 @@ class customized_callbacks = object(self)
in
let extra_cfiles =
if
self#top_extra_env_var_window#extra_cfiles_entry#text = ""
then
""
else
("set_extra_cfiles \"" ^
(String.escaped self#top_extra_env_var_window#extra_cfiles_entry#text) ^ "\"\n")
("set_extra_cfiles \"" ^
(String.escaped self#top_extra_env_var_window#extra_cfiles_entry#text) ^ "\"\n")
and extra_libs =
if
self#top_extra_env_var_window#extra_libs_entry#text = ""
then
""
else
("set_extra_libs \"" ^
(String.escaped self#top_extra_env_var_window#extra_libs_entry#text) ^ "\"\n")
and extra_libdirs =
if
self#top_extra_env_var_window#extra_libdirs_entry#text = ""
then
""
else
and extra_libdirs =
("set_extra_libdirs \"" ^
(String.escaped self#top_extra_env_var_window#extra_libdirs_entry#text) ^ "\"\n")
and extra_includedirs =
if
self#top_extra_env_var_window#extra_includedirs_entry#text = ""
then
""
else
("set_extra_includedirs \"" ^
(String.escaped self#top_extra_env_var_window#extra_includedirs_entry#text) ^ "\"\n")
in
......@@ -1309,8 +1327,10 @@ let main () =
let _ = Timeout.add ~ms:100 ~callback:callbacks#read_ltop_stdout in
let _ = Timeout.add ~ms:100 ~callback:callbacks#read_ltop_stderr in
Main.main ()
(* try *)
Main.main ()
(* with _ -> *)
(* print_string "Did you set all\n" *)
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 139)
(Parent-Version lurette 0 138)
(Project-Version lurette 0 140)
(Parent-Version lurette 0 139)
(Version-Log "
Make it work under cygwin.
Add the possibility of setting extra env var to link external libs or c files.
ihm/xlurette/xlurette_main.ml:
Change the current dir when the sut changes so that the current dir is the
dir of the sut.
source/lurettetop.ml:
Add a change_dir command.
Make user_dir and tmp_lurette global vars.
share/configure.in:
create .bat and sh scripts take set env vars and run tools
(xlurette and lurettetop) so that sourcing lucky_init.cs is
no longer necessary.
")
(New-Version-Log ""
)
(Checkin-Time "Wed, 18 Jun 2003 10:59:43 +0200")
(Checkin-Time "Mon, 23 Jun 2003 15:19:23 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -44,7 +55,7 @@ Add the possibility of setting extra env var to link external libs or c files.
(source/env.mli (lurette/15_env.mli 1.17 644))
(source/env.ml (lurette/16_env.ml 1.30 644))
(source/util.ml (lurette/35_util.ml 1.49 644))
(source/util.ml (lurette/35_util.ml 1.50 644))
(source/solver.mli (lurette/38_solver.mli 1.14 644))
(source/solver.ml (lurette/39_solver.ml 1.48 644))
......@@ -85,7 +96,7 @@ Add the possibility of setting extra env var to link external libs or c files.
(source/gne.mli (lurette/b/36_gne.mli 1.5 644))
(source/gne.ml (lurette/b/37_gne.ml 1.5 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.36 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.37 644))
(source/draw.mli (lurette/f/1_draw.mli 1.1 644))
(source/draw.ml (lurette/f/2_draw.ml 1.1 644))
......@@ -127,7 +138,7 @@ Add the possibility of setting extra env var to link external libs or c files.
;; Make files
(share/lucky.el (lurette/f/7_lucky.el 1.1 644))
(share/lucky.el (lurette/f/7_lucky.el 1.2 644))
(share/pixmaps/stop.xpm (lurette/f/8_stop.xpm 1.1 644))
(share/pixmaps/stock_save.xpm (lurette/f/9_stock_save 1.1 644))
(share/pixmaps/stock_exec.xpm (lurette/f/10_stock_exec 1.1 644))
......@@ -146,12 +157,12 @@ Add the possibility of setting extra env var to link external libs or c files.
(share/pixmaps/chrono.xpm (lurette/f/23_chrono.xpm 1.1 644))
(share/pixmaps/button-close.xpm (lurette/f/24_button-clo 1.1 644))
(share/config.guess (lurette/f/25_config.gue 1.1 755))
(share/configure.in (lurette/d/11_configure. 1.9 644))
(share/configure.in (lurette/d/11_configure. 1.10 644))
(share/Makefile.common.in (lurette/d/12_Makefile.c 1.5 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.5 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.51 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.25 644))
(user-rules (lurette/c/14_myrules 1.37 644))
(user-rules (lurette/c/14_myrules 1.38 644))
(share/Makefile.test (lurette/c/25_user-rules 1.6 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
......@@ -161,7 +172,7 @@ Add the possibility of setting extra env var to link external libs or c files.
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.21 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.7 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.20 644))
(source/Makefile (lurette/c/20_Makefile 1.19 644))
(source/Makefile (lurette/c/20_Makefile 1.20 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -172,23 +183,23 @@ Add the possibility of setting extra env var to link external libs or c files.
(doc/ocamldoc.hva (lurette/b/13_ocamldoc.h 1.1 644))
;; Misc
(README (lurette/10_README 1.9 644))
(README (lurette/10_README 1.10 644))
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(INSTALL (lurette/f/26_INSTALL 1.1 744))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.18 644))
(TODO (lurette/d/22_TODO 1.19 644))
(share/lucky_init.csh.in (lurette/e/23_lucky_init 1.6 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.7 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.8 644))
(share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.2 744))
(share/plot (lurette/e/35_plot 1.3 744))
(test/time-ossau.exp (lurette/b/48_time.exp 1.44 644))
(test/time-ossau.res (lurette/b/49_time.res 1.47 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.21 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.21 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.3 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.3 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.45 644))
(test/time-ossau.res (lurette/b/49_time.res 1.48 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.22 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.22 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.4 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.4 644))
;; Various files used for testing purposes
(test/cudd_gc_problem.luc (lurette/e/29_cudd_gc_pr 1.1 644))
......@@ -280,10 +291,10 @@ Add the possibility of setting extra env var to link external libs or c files.
(test/Makefile (lurette/c/0_Makefile 1.12 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.23 644))
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.24 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.18 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.17 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.15 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.16 644))
;; cudaux
......
......@@ -218,7 +218,7 @@ esac
#-----------------------------------------------------------------------------#
PIXMAP_DIR="$LURETTE_PATH"/share/pixmaps/
PIXMAP_DIR="$LURETTEPATH"/share/pixmaps/
case "$HOST_TYPE" in
cygwin)
......@@ -258,29 +258,51 @@ fi
AC_CHECK_PROG(GV,gv,gv,no)
if test "$GV" = no ; then
AC_CHECK_PROG(GV,gv,gv,gv)
AC_MSG_WARN(Cannot find gv. You will not be able to use show_luc)
fi
#-----------------------------------------------------------------------------#
AC_OUTPUT(Makefile.lurette lucky_init.sh lucky_init.csh)
AC_OUTPUT(Makefile.lurette lucky_init.sh lucky.sh lucky.bat lucky_init.csh lurettetop.sh lurettetop.bat xlurette.sh xlurette.bat)
mv $LURETTEPATH/share/Makefile.lurette $LURETTEPATH/$HOST_TYPE/Makefile.lurette
mv $LURETTEPATH/share/lucky_init.sh $LURETTEPATH/$HOST_TYPE/lucky_init.sh
mv $LURETTEPATH/share/lucky_init.csh $LURETTEPATH/$HOST_TYPE/lucky_init.csh
echo " Do not forget to do a "
echo " source $LURETTEPATH/$HOST_TYPE/lucky_init.sh "
echo " or"
echo " source $LURETTEPATH/$HOST_TYPE/lucky_init.csh"
echo " if you are using csh, before using Lucky tools."
case "$HOST_TYPE" in
cygwin)
mv $LURETTEPATH/share/lurettetop.bat $LURETTEPATH/$HOST_TYPE/bin
mv $LURETTEPATH/share/xlurette.bat $LURETTEPATH/$HOST_TYPE/bin
mv $LURETTEPATH/share/lucky.bat $LURETTEPATH/$HOST_TYPE/bin
;;
esac
chmod a+x lurettetop.sh
chmod a+x xlurette.sh
chmod a+x lucky.sh
mv $LURETTEPATH/share/lurettetop.sh $LURETTEPATH/$HOST_TYPE/bin
mv $LURETTEPATH/share/xlurette.sh $LURETTEPATH/$HOST_TYPE/bin
mv $LURETTEPATH/share/lucky.sh $LURETTEPATH/$HOST_TYPE/bin
echo
echo " You migth wish to add \"source $LURETTEPATH/$HOST_TYPE/lucky_init.sh\" "
echo " (resp \"source $LURETTEPATH/$HOST_TYPE/lucky_init.sh\") "
echo " in your .bashrc (resp .cshrc)."
echo " Installation terminated."
echo
echo " The executable files are in $LURETTEPATH/$HOST_TYPE/bin."
echo " To be ale to use them, either you source $HOST_TYPE/lucky_init.{sh,csh} file,"
case "$HOST_TYPE" in
cygwin)
echo " or you use the .bat scripts in $HOST_TYPE/bin"
;;
*)
echo " or you use the .sh scripts in $HOST_TYPE/bin"
;;
esac
echo " "
echo " if you want to install tools anywhere else than lurette-XXX/$HOST_TYPE/{bin,lib}"
echo " you can type "
echo " cd share "
......
......@@ -20,7 +20,7 @@
(setq lucky-font-lock-keywords
'(
("(*.*$" . font-lock-comment-face)
("\\(*.*$" . font-lock-comment-face)
("\\<\\(weight\\|max\\|min\\|default\\|cond\\|max\\|With\\)\\>" . font-lock-string-face)
("\\<\\(IfThenElse\\|IfThenElseNum\\|Dec\\|Return_not_sig\\|Return_sig\\|Draw_between\\|Draw_gauss\\|Set\\|Set_between\\|+\\|*\\|-\\|/\\|mod\\)\\>"
......@@ -59,7 +59,8 @@ font-lock-function-name-face)))
(setq major-mode 'lucky-mode)
(setq mode-name "Lucky")
(use-local-map lucky-mode-map)
(run-hooks 'lucky-mode-hook))
(run-hooks 'lucky-mode-hook)
)
(setq comment-start "(*")
......