Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 2b554dc7 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 1.34 Thu, 22 Jul 2004 15:47:05 +0200 by jahier

Parent-Version:      1.33
Version-Log:

A first steps toward an interface to sildex is done. Its seems
to work. It has to be tested more though.

Project-Description: Lurette
parent 2880f23d
......@@ -4,12 +4,12 @@
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(source/show_env.mli 1198 1088597013 42_show_env.m 1.14)
(source/util.ml 22941 1090330182 35_util.ml 1.71)
(test/time-asti.res 5227 1090330182 h/40_time-asti. 1.4)
(test/time-asti.res 5238 1090504025 h/40_time-asti. 1.5)
(test/cygwin-scade/lib_pilot.vsp 1433 1055926783 f/47_lib_pilot. 1.1)
(source/constraint.mli 1697 1082533083 c/18_constraint 1.10)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 129 1071844798 d/10_Changes 1.2)
(TODO 7928 1090330182 d/22_TODO 1.50)
(TODO 8504 1090504025 d/22_TODO 1.51)
(share/gen_fake_lutin.sh.in 115 1063786164 g/30_gen_fake_l 1.1)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/fair_bddd.ml 21501 1090330182 g/38_fair_bddd. 1.9)
......@@ -44,7 +44,7 @@
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(test/test10.rif.exp 4572 1083336219 g/16_test10.rif 1.8)
(test/test-scade-cygwin.res 0 1055926783 f/28_test-scade 1.1)
(source/gen_stubs_common.ml 14899 1088412276 e/39_gen_stubs_ 1.5)
(source/gen_stubs_common.ml 15016 1090504025 e/39_gen_stubs_ 1.6)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(test/cygwin-scade/Pilot_cst.saofd 788 1055926783 f/38_Pilot_cst. 1.1)
(test/cygwin-scade/lib_pilot.etp 1173 1055926783 f/48_lib_pilot. 1.1)
......@@ -71,7 +71,7 @@
(source/gen_stubs_poc.mli 643 1088412276 f/4_gen_stubs_ 1.4)
(test/losange-3d.luc 552 1076684617 d/28_losange-3d 1.5)
(test/time-moucherotte.res 4158 1088412276 e/38_time-mouch 1.24)
(share/show_luc.bat 678 1090330182 h/43_show_luc.b 1.1)
(share/show_luc.bat 698 1090504025 h/43_show_luc.b 1.2)
(polka/caml/poly.idl 10352 1076684617 d/33_poly.idl 1.3)
(test/tram/controleur_env.luc 433 1073401581 h/6_controleur 1.1)
(polka/documentation/texinfo.tex 200195 1047029868 e/16_texinfo.te 1.1)
......@@ -86,16 +86,16 @@
(test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1)
(polka/Changes 1952 1071844798 e/22_Changes 1.2)
(source/poly_draw.mli 1514 1078751438 g/44_polyDraw.m 1.4)
(share/show_luc.sh 174 1090330182 h/42_show_luc.s 1.1)
(share/show_luc.sh 184 1090504025 h/42_show_luc.s 1.2)
(test/losange-10d.luc 1499 1076684617 g/42_losange-10 1.4)
(test/sparc-scade/libdigital.saofdm 1256 1055487917 e/47_libdigital 1.1)
(share/lucky.vim 1861 1090330182 h/44_lucky.vim 1.1)
(test/temp_int.luc 517 1063786164 b/50_temp_int.e 1.7)
(source/print.mli 1130 1078751438 46_print.mli 1.15)
(test/time-joly.exp 10267 1090330182 b/48_time.exp 1.66)
(test/time-joly.exp 10136 1090504025 b/48_time.exp 1.67)
(polka/caml/Makefile 6586 1071844798 d/45_Makefile 1.4)
(test/cygwin-scade/det_mvt_mode.saofd 4184 1055926783 f/51_det_mvt_mo 1.1)
(ihm/xlurette/xlurette_glade_main.ml 62678 1090330182 c/12_xlurette_g 1.43)
(ihm/xlurette/xlurette_glade_main.ml 62799 1090504025 c/12_xlurette_g 1.44)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 112097 1090330182 c/13_xlurette.g 1.33)
......@@ -110,7 +110,7 @@
(source/gne.ml 3426 1082533083 b/37_gne.ml 1.9)
(test/cygwin-scade/Pilot.vsp 2075 1055926783 f/40_Pilot.vsp 1.1)
(source/parse_c_scade.ml 6921 1078751438 e/41_parse_c_sc 1.5)
(source/gen_stubs_sildex.mli 646 1088412276 h/37_gen_stubs_ 1.1)
(source/gen_stubs_sildex.mli 648 1090504025 h/37_gen_stubs_ 1.2)
(share/lurettetop.sh.in 164 1080290901 g/25_lurettetop 1.3)
(test/cygwin-scade/position_validation.saofd 10188 1055926783 f/36_position_v 1.1)
(test/sparc-scade/exo1.saofdm 332 1074519403 e/50_exo1.saofd 1.2)
......@@ -154,7 +154,7 @@
(test/cygwin-scade/Pilot.etp 2175 1055926783 f/43_Pilot.etp 1.1)
(polka/C/pkint.h 6036 1047029868 e/12_pkint.h 1.1)
(share/pixmaps/gnuplot-rif.xpm 645 1055926783 f/19_gnuplot-ri 1.1)
(source/gen_stubs.ml 13356 1088412276 24_generate_l 1.57)
(source/gen_stubs.ml 13517 1090504025 24_generate_l 1.58)
(polka/caml/vector.idl 10381 1076684617 d/35_vector.idl 1.4)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(source/sim2chro.mli 1532 1078751438 b/23_sim2chro.m 1.12)
......@@ -183,7 +183,7 @@
(test/tram/tramway.lus 4353 1080290901 h/1_tramway.lu 1.3)
(mlcuddidl/session.ml 603 1034006019 c/37_session.ml 1.1)
(demo-xlurette/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(share/Makefile.lurette.in 4344 1090330182 b/38_Makefile.l 1.33)
(share/Makefile.lurette.in 5619 1090504025 b/38_Makefile.l 1.34)
(source/lucky.ml 8925 1088432998 16_env.ml 1.44)
(source/graph.mli 2451 1088432998 13_graph.mli 1.15)
(source/store.mli 3812 1078751438 b/26_rnumsolver 1.26)
......@@ -214,9 +214,9 @@
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(source/run_aut.ml 23378 1088597013 b/47_automata.m 1.28)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(source/gen_stubs_sildex.ml 8922 1088412276 h/38_gen_stubs_ 1.1)
(source/gen_stubs_sildex.ml 9698 1090504025 h/38_gen_stubs_ 1.2)
(mlcuddidl/bdd.ml 11038 1071844798 d/6_bdd.ml 1.2)
(source/lurettetop.ml 67050 1090330182 c/1_lurettetop 1.56)
(source/lurettetop.ml 67109 1090504025 c/1_lurettetop 1.57)
(source/lexeme.mli 382 1078751438 h/21_lexeme.mli 1.1)
(test/tram/tramway.luc 1138 1080290901 h/2_tramway.lu 1.2)
(source/constraint.ml 3143 1088597013 c/19_constraint 1.12)
......@@ -231,20 +231,20 @@
(INSTALL 479 1082533083 f/26_INSTALL 1.3)
(test/cygwin-scade/MyConsts.saofd 153 1055926783 f/44_MyConsts.s 1.1)
(test/losange-3d2.luc 355 1076684617 e/32_losange-3d 1.6)
(test/Makefile 4080 1088432998 c/0_Makefile 1.21)
(user-rules 43141 1090330182 c/14_myrules 1.65)
(test/Makefile 4135 1090504025 c/0_Makefile 1.22)
(user-rules 43696 1090504025 c/14_myrules 1.66)
(test/infinite_weight.luc 1116 1090330182 g/13_infinite_w 1.5)
(mlcuddidl/cudd_caml.c 23483 1071844798 d/3_cudd_caml. 1.2)
(polka/C/config.h 78 1071844798 e/13_config.h 1.2)
(test/usager.luc 454 1063786164 b/14_usager.env 1.13)
(share/xlurette.bat.in 670 1063786164 g/22_xlurette.b 1.1)
(source/parse_sildex.mli 818 1088412276 h/35_parse_sild 1.1)
(source/parse_sildex.mli 881 1090504025 h/35_parse_sild 1.2)
(mlcuddidl/manager.idl 11064 1071844798 c/48_manager.id 1.2)
(source/rif.ml 7410 1088412276 h/27_rif.ml 1.3)
(mlcuddidl/cudd_caml.h 1178 1071844798 d/2_cudd_caml. 1.2)
(source/show_env.ml 3430 1088597013 43_show_env.m 1.23)
(polka/C/essai.c 1001 1047029868 e/11_essai.c 1.1)
(test/time-asti.exp 4580 1090330182 h/41_time-asti. 1.3)
(test/time-asti.exp 5227 1090504025 h/41_time-asti. 1.4)
(demo-xlurette/fault-tolerant-heater/heater_control_env.luc 382 1076684617 h/16_heater_con 1.1)
(share/pixmaps/button-close.xpm 746 1055926783 f/24_button-clo 1.1)
(test/cygwin-scade/regulation.saofd 15074 1055926783 f/35_regulation 1.1)
......@@ -281,11 +281,11 @@
(polka/caml/polka.mli 856 1071844798 d/38_polka.mli 1.2)
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
(source/control.mli 3187 1078751438 c/3_control.ml 1.4)
(source/parse_sildex.ml 4857 1088412276 h/36_parse_sild 1.1)
(source/parse_sildex.ml 7778 1090504025 h/36_parse_sild 1.2)
(polka/caml/polka_lexer.mll 786 1047029868 d/42_polka_lexe 1.1)
(cuddaux/cuddauxInt.h 2058 1034006019 c/28_cuddauxInt 1.1)
(polka/caml/polkaIO.mli 1517 1047029868 d/43_polkaIO.ml 1.1)
(test/time-joly.res 10136 1090330182 b/49_time.res 1.72)
(test/time-joly.res 10139 1090504025 b/49_time.res 1.73)
(test/cygwin-scade/det_mvt_mode_cstext.c 703 1055926783 f/33_det_mvt_mo 1.1)
(test/cygwin-scade/pilot.saofdm 394 1055926783 f/41_pilot.saof 1.1)
(source/parse_poc.mli 1131 1078751438 d/29_parse_poc. 1.5)
......@@ -311,7 +311,7 @@
(source/value.mli 1180 1078751438 c/24_value.mli 1.8)
(polka/Makefile.config 1803 1071844798 e/20_Makefile.c 1.6)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 10801 1090330182 c/20_Makefile 1.36)
(source/Makefile 10879 1090504025 c/20_Makefile 1.37)
(source/graph.ml 3780 1088432998 14_graph.ml 1.13)
(test/cudd_gc_problem.luc 208372 1063029729 e/29_cudd_gc_pr 1.2)
(test/time-CHAILLOL.exp 8235 1063029729 g/10_time-CHAIL 1.1)
......@@ -352,4 +352,4 @@
(source/rif.mli 719 1080290901 h/28_rif.mli 1.1)
(mlcuddidl/Makefile 7482 1078749975 d/9_Makefile 1.12)
(source/Makefile.show_luc 1510 1090330182 b/40_Makefile.s 1.15)
(test/time-rey.exp 10276 1090330182 h/13_time-rey.e 1.9)
(test/time-rey.exp 10176 1090504025 h/13_time-rey.e 1.10)
......@@ -73,13 +73,28 @@ prend 170 secondes pour n=10000
> bug_array__invariant_acceleration of type bool
> ----------------------------------------------------------------------
* Bug Nicolas 3
> * après avoir modifié un fichier C, je quitte Lurette pour que ce
> fichier soit recompilé et linké dans lurette. Y a-t-il un autre
> moyen ?
* utiliser la meme version de caml pour gcc2 et gcc3 car sinon
on ne peut pas reproduire les tests a partir de la graine !!!
*********** A faire
* Portage Sildex
* le nom du repertoire share est particulierement mal choisi...
* mettre les .pl* dans le repertoire temporaire.
> * différents fichiers temporaires sont générés dans le répertoire
> de travail : *.ps et *.dot, pl*.001, *.ec Y a-t-il un intérêt à
> concerver ces fichiers ? Sinon, pourraient-ils être générés dans
> le répertoire temporaire ?
* dans lucky, lors d'une erreur de type, demander aux gens de ressaye
......
......@@ -1269,6 +1269,7 @@ class customized_callbacks = object(self)
method update_sut_and_oracle_combo () =
let files_lus = (get_files_list_filtered "*.lus *.c" [""]) in
let files_sao = (get_files_list_filtered "*.saofdm *.lus *.c" [""]) in
let files_c = (get_files_list_filtered "*.c" [""]) in
let files_ec = (get_files_list_filtered "*.ec" [""]) in
let sut = self#top_xlurette#sut_name#entry#text
and oracle = self#top_xlurette#oracle_name#entry#text
......@@ -1286,6 +1287,10 @@ class customized_callbacks = object(self)
if files_sao <> [] then
self#top_xlurette#oracle_name#set_popdown_strings files_sao ;
| "sildex" ->
if files_c <> [] then
self#top_xlurette#oracle_name#set_popdown_strings files_c ;
| _ -> ()
);
......@@ -1303,6 +1308,12 @@ class customized_callbacks = object(self)
self#top_xlurette#sut_name#set_popdown_strings files_sao ;
)
| "sildex" ->
if files_c <> [] then
(
self#top_xlurette#sut_name#set_popdown_strings files_c ;
)
| "stdin/stdout" ->
let msgl =
[ "% ZZZ experimental and undocumented ";
......@@ -1432,11 +1443,11 @@ class customized_callbacks = object(self)
self#top_xlurette#output_window#insert msg
(* method save_session () = *)
(* output_string oc ("pack " ^ self#top_xlurette#saved_session_file#text ^ " \n"); *)
(* flush oc; *)
(* prerr_endline "save session ..."; *)
(* () *)
(* method save_session () = *)
(* output_string oc ("pack " ^ self#top_xlurette#saved_session_file#text ^ " \n"); *)
(* flush oc; *)
(* prerr_endline "save session ..."; *)
(* () *)
method get_env () =
......@@ -1546,17 +1557,17 @@ class customized_callbacks = object(self)
method set_rif_file_basename str =
self#top_set_parameters_window#rif_file_basename#set_text str
(* method get_restore () = *)
(* self#top_set_parameters_window#saved_session_file#text *)
(* method set_restore str = *)
(* self#top_set_parameters_window#saved_session_file#set_text str *)
(* method get_restore () = *)
(* self#top_set_parameters_window#saved_session_file#text *)
(* method set_restore str = *)
(* self#top_set_parameters_window#saved_session_file#set_text str *)
method read_commands line =
let lexer = Genlex.make_lexer [] in
let (parse_ident_or_string : tok -> string) =
fun tok ->
......@@ -1571,30 +1582,12 @@ class customized_callbacks = object(self)
flush stdout;
""
in
let rec (parse_env : tok -> string) =
fun tok ->
try
(
match tok with parser
| [< 'Genlex.Ident "x" ; tail = parse_env >] -> (" x " ^ tail)
| [< 'Genlex.String str ; tail = parse_env >] ->
( str ^ tail)
| [< 'Genlex.Ident id ; tail = parse_env >] -> (id ^ " " ^ tail)
| [< _ >] -> ""
)
with e ->
print_string (Printexc.to_string e);
print_string
"*** Error when parsing the environment field.\n";
flush stdout;
""
in
let rec read_cmd tok =
(* : 'a -> tok -> unit) = *)
( match tok with parser
( match tok with parser
| [< 'Genlex.Ident "set_env" ; 'Genlex.String str >] ->
self#set_env str
......@@ -1613,8 +1606,8 @@ class customized_callbacks = object(self)
let rif_file_str' = (remove_the_end rif_file_str) in
self#set_rif_file_basename rif_file_str';
rif_file := rif_file_str'
| [<
'Genlex.Ident "set_sut_cmd" ; 'Genlex.String str
>] ->
......@@ -1630,7 +1623,7 @@ class customized_callbacks = object(self)
pre_oracle_node := "";
self#set_oracle str;
self#set_oracle_node ""
| [<
'Genlex.Ident "set_sut" ;
str = parse_ident_or_string ;
......@@ -1640,7 +1633,7 @@ class customized_callbacks = object(self)
pre_sut_node := node;
self#set_sut str;
self#set_sut_node node
| [<
'Genlex.Ident "set_oracle" ;
str = parse_ident_or_string ;
......@@ -1656,7 +1649,7 @@ class customized_callbacks = object(self)
| [<
'Genlex.Ident "set_oracle_compiler" ;
str = parse_ident_or_string
str = parse_ident_or_string
>] ->
self#set_oracle_compiler str
......@@ -1739,9 +1732,9 @@ class customized_callbacks = object(self)
| [< 'Genlex.Ident "set_show_step" ; 'Genlex.Ident id >] ->
()
(* if id = "true" *)
(* then self#top_set_parameters_window#radiobutton_show_step_on#set_active true *)
(* else self#top_set_parameters_window#radiobutton_show_step_off#set_active true *)
(* if id = "true" *)
(* then self#top_set_parameters_window#radiobutton_show_step_on#set_active true *)
(* else self#top_set_parameters_window#radiobutton_show_step_off#set_active true *)
| [< 'Genlex.Ident "set_extra_cfiles" ; 'Genlex.String str >] ->
self#top_extra_env_var_window#extra_cfiles_entry#set_text str
......@@ -1758,30 +1751,35 @@ class customized_callbacks = object(self)
| [< 'Genlex.Ident "set_c_generator_flag" ; 'Genlex.String str >] ->
self#top_extra_env_var_window#c_generator_flag_entry#set_text str
| [< _ >] -> ()
)
and
(parse_node : tok -> string) =
fun tok ->
let str =
try
match tok with parser
| [< 'Genlex.String id >] -> id
| [< 'Genlex.Ident id >] -> id
| [< >] -> ""
with _ ->
""
in
let base = Filename.basename str in
try Filename.chop_extension base
with _ -> base
in
read_cmd (lexer (Stream.of_string line))
)
and
(parse_node : tok -> string) =
fun tok ->
let str =
try
match tok with parser
| [< 'Genlex.String id >] -> id
| [< 'Genlex.Ident id >] -> id
| [< >] -> ""
with _ ->
""
in
let base = Filename.basename str in
try Filename.chop_extension base
with _ -> base
in
try
read_cmd (lexer (Stream.of_string line))
with _ ->
print_string (
"*** An error occured when parsing the \".lurette_rc\" file" ^
" of your current directory.\n Remove (or rename) it and then try" ^
" again.\n If it still does not work, please send a bug report.\n");
flush stdout;
exit 1
end
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 33)
(Parent-Version lurette 1 32)
(Project-Version lurette 1 34)
(Parent-Version lurette 1 33)
(Version-Log "
source/lurette.ml:
source/command_line_luc_exe.mli:
source/command_line_luc_exe.ml:
source/command_line.ml:
source/command_line.mli:
Random seed was encoded by a seed of 0, which is unfortunate
when the user set the seed to 0...
source/util.ml:
xlurette/xlurette.glade:
Add a C_GENERATOR_FLAG to let users add options to lustre2c and ec2C.
source/parse_luc.ml:
Issue a Warning when a node is not declared before being used.
A first steps toward an interface to sildex is done. Its seems
to work. It has to be tested more though.
")
(New-Version-Log ""
)
(Checkin-Time "Tue, 20 Jul 2004 15:29:42 +0200")
(Checkin-Time "Thu, 22 Jul 2004 15:47:05 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -95,7 +81,7 @@ source/parse_luc.ml:
(source/gne.mli (lurette/b/36_gne.mli 1.8 644))
(source/gne.ml (lurette/b/37_gne.ml 1.9 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.56 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.57 644))
(source/draw.mli (lurette/f/1_draw.mli 1.4 644))
(source/draw.ml (lurette/f/2_draw.ml 1.6 644))
......@@ -104,8 +90,8 @@ source/parse_luc.ml:
(source/gen_stubs_poc.mli (lurette/f/4_gen_stubs_ 1.4 644))
(source/gen_stubs_scade.ml (lurette/f/5_gen_stubs_ 1.5 644))
(source/gen_stubs_scade.mli (lurette/f/6_gen_stubs_ 1.3 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.57 644))
(source/gen_stubs_common.ml (lurette/e/39_gen_stubs_ 1.5 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.58 644))
(source/gen_stubs_common.ml (lurette/e/39_gen_stubs_ 1.6 644))
(source/gen_stubs_common.mli (lurette/e/40_gen_stubs_ 1.4 644))
(source/parse_c_scade.ml (lurette/e/41_parse_c_sc 1.5 644))
(source/parse_c_scade.mli (lurette/e/42_parse_c_sc 1.4 644))
......@@ -158,8 +144,8 @@ source/parse_luc.ml:
(share/configure.in (lurette/d/11_configure. 1.21 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.11 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.52 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.33 644))
(user-rules (lurette/c/14_myrules 1.65 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.34 644))
(user-rules (lurette/c/14_myrules 1.66 644))
(share/Makefile.test.in (lurette/c/25_user-rules 1.13 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
......@@ -169,7 +155,7 @@ source/parse_luc.ml:
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.33 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.11 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.31 644))
(source/Makefile (lurette/c/20_Makefile 1.36 644))
(source/Makefile (lurette/c/20_Makefile 1.37 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -183,17 +169,17 @@ source/parse_luc.ml:
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(INSTALL (lurette/f/26_INSTALL 1.3 744))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.50 644))
(TODO (lurette/d/22_TODO 1.51 644))
(share/lucky_init.csh.in (lurette/e/23_lucky_init 1.8 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.12 644))
(share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.11 755))
(share/plot (lurette/e/35_plot 1.12 755))
(test/time-rey.exp (lurette/h/13_time-rey.e 1.9 644))
(test/time-rey.exp (lurette/h/13_time-rey.e 1.10 644))
(test/time-rey.res (lurette/h/14_time-rey.r 1.11 644))
(test/time-joly.exp (lurette/b/48_time.exp 1.66 644))
(test/time-joly.res (lurette/b/49_time.res 1.72 644))
(test/time-joly.exp (lurette/b/48_time.exp 1.67 644))
(test/time-joly.res (lurette/b/49_time.res 1.73 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.46 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.45 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.23 644))
......@@ -293,10 +279,10 @@ source/parse_luc.ml:
(test/test9.rif.exp (lurette/g/17_test9.rif. 1.7 644))
(test/test8.rif.exp (lurette/g/18_test8.rif. 1.7 644))
(test/Makefile (lurette/c/0_Makefile 1.21 644))
(test/Makefile (lurette/c/0_Makefile 1.22 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.43 644))
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.44 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.33 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.31 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.22 644))
......@@ -599,10 +585,10 @@ source/parse_luc.ml:
;; Files added by populate at Wed, 16 Jun 2004 10:21:19 +0200,
;; to version 1.29(w), by jahier:
(source/parse_sildex.mli (lurette/h/35_parse_sild 1.1 644))
(source/parse_sildex.ml (lurette/h/36_parse_sild 1.1 644))
(source/gen_stubs_sildex.mli (lurette/h/37_gen_stubs_ 1.1 644))
(source/gen_stubs_sildex.ml (lurette/h/38_gen_stubs_ 1.1 644))
(source/parse_sildex.mli (lurette/h/35_parse_sild 1.2 644))
(source/parse_sildex.ml (lurette/h/36_parse_sild 1.2 644))
(source/gen_stubs_sildex.mli (lurette/h/37_gen_stubs_ 1.2 644))
(source/gen_stubs_sildex.ml (lurette/h/38_gen_stubs_ 1.2 644))
;; Files added by populate at Fri, 25 Jun 2004 10:42:17 +0200,
;; to version 1.29(w), by jahier:
......@@ -612,18 +598,18 @@ source/parse_luc.ml:
;; Files added by populate at Mon, 28 Jun 2004 10:29:06 +0200,
;; to version 1.29(w), by jahier:
(test/time-asti.res (lurette/h/40_time-asti. 1.4 644))
(test/time-asti.exp (lurette/h/41_time-asti. 1.3 644))
(test/time-asti.res (lurette/h/40_time-asti. 1.5 644))
(test/time-asti.exp (lurette/h/41_time-asti. 1.4 644))
;; Files added by populate at Mon, 19 Jul 2004 16:17:17 +0200,
;; to version 1.32(w), by jahier:
(share/show_luc.sh (lurette/h/42_show_luc.s 1.1 755))
(share/show_luc.sh (lurette/h/42_show_luc.s 1.2 755))
;; Files added by populate at Mon, 19 Jul 2004 16:17:58 +0200,
;; to version 1.32(w), by jahier:
(share/show_luc.bat (lurette/h/43_show_luc.b 1.1 644))
(share/show_luc.bat (lurette/h/43_show_luc.b 1.2 644))
;; Files added by populate at Tue, 20 Jul 2004 15:29:35 +0200,
;; to version 1.32(w), by jahier:
......
......@@ -15,10 +15,16 @@
# lurette users to add their owns libs for their applications.
ifndef CC
CC := gcc
endif
ifndef DEBUG
DEBUG :=
endif
##############################################################################
#
# Academic lustre
HOST_TYPE=@HOST_TYPE@
LURETTE_PATH = @LURETTEPATH@
......@@ -30,12 +36,17 @@ LIBDIRS = -L@LURETTEPATH@/@HOST_TYPE@/lib -L$(LURETTE_TMP_DIR) $(EXTRA_LIBDIRS)
LIBS = -lgmp -lm @LDL@ $(EXTRA_LIBS)
SOURCES_C = $(LURETTE_TMP_DIR)/ocaml2c_stubs.c $(EXTRA_CFILES) $(SUT_DIR)/$(SUT).c \
lurette__sut.c $(ORACLE_DIR)/$(ORACLE).c \
$(LURETTE_TMP_DIR)/lurette__oracle.c \
$(LURETTE_TMP_DIR)/lurette_exe.c $(LURETTE_TMP_DIR)/call_lurette_main.c
##############################################################################
#
# Academic lustre
SOURCES_C = $(LURETTE_TMP_DIR)/ocaml2c_stubs.c $(EXTRA_CFILES) \
$(SUT_DIR)/$(SUT).c lurette__sut.c \
$(ORACLE_DIR)/$(ORACLE).c $(LURETTE_TMP_DIR)/lurette__oracle.c \
$(LURETTE_TMP_DIR)/lurette_exe.c $(LURETTE_TMP_DIR)/call_lurette_main.c
bc:
......@@ -53,6 +64,8 @@ nc:
all: nc
##############################################################################
#
# Scade
......@@ -95,12 +108,6 @@ NODE_OBJ = \
$(NODE_OBJECTS)/LibMathAdvanced.o
ifndef CC
CC := gcc
endif
# DEBUG=-g
DEBUG=
$(NODE_OBJECTS)/ocaml2c_stubs.o : $(LURETTE_TMP_DIR)/ocaml2c_stubs.c
$(CC) $(DEBUG) $(LIBDIRS) $(INCLUDEDIRS) \
......@@ -149,3 +156,39 @@ scade: $(NODE_OBJ)
$(CC) $(DEBUG) $(SCADE_LIB_DIRS) $(SCADE_INCLUDE_DIRS) $(NODE_OBJ) $(LDFLAGS) \
$(LIB_GC) $(LIB_OS) $(EXTRA_CFILES) -llurette_lib_nc $(LIBS) -o lurette
##############################################################################
#
# Sildex
$(LURETTE_TMP_DIR)/$(HOST_TYPE)/lurette__sut.o: lurette__sut.c
$(CC) $(DEBUG) $(LIBDIRS) $(INCLUDEDIRS) \
-c $(LURETTE_TMP_DIR)/lurette__sut.c -o $@
$(LURETTE_TMP_DIR)/$(HOST_TYPE)/lurette__oracle.o: lurette__oracle.c
$(CC) $(DEBUG) $(LIBDIRS) $(INCLUDEDIRS) \
-c $(LURETTE_TMP_DIR)/lurette__oracle.c -o $@
ifndef SILDEXCC
SILDEXCC := gcc
endif
SILDEX_SOURCES_C = $(LURETTE_TMP_DIR)/ocaml2c_stubs.c $(EXTRA_CFILES) \
$(LURETTE_TMP_DIR)/lurette_exe.c $(LURETTE_TMP_DIR)/call_lurette_main.c
SILDEX_OBJECT_FILES = $(LURETTE_TMP_DIR)/$(HOST_TYPE)/lurette__sut.o \
$(LURETTE_TMP_DIR)/$(HOST_TYPE)/lurette__oracle.o
sildex_sut: $(SILDEX_OBJECT_FILES)
$(SILDEXCC) -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SILDEX_OBJECT_FILES) \
$(SILDEX_SOURCES_C) $(ORACLE_DIR)/$(ORACLE).c -llurette_lib_nc $(LIBS)
sildex_oracle: $(SILDEX_OBJECT_FILES)
$(SILDEXCC) -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SILDEX_OBJECT_FILES) \
$(SILDEX_SOURCES_C) $(ORACLE_DIR)/$(SUT).c -llurette_lib_nc $(LIBS)
sildex_both: $(SILDEX_OBJECT_FILES)
$(SILDEXCC) -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SILDEX_OBJECT_FILES) \
$(SILDEX_SOURCES_C) -llurette_lib_nc $(LIBS)
......@@ -5,15 +5,15 @@ set LURETTE_PATH=/home/jahier/lurette
set PIXMAP_DIR=/home/jahier/lurette/share/pixmaps/
set path=/home/jahier/lurette/i386-linux/bin:$path
set PATH=/home/jahier/lurette/i386-linux/bin:$PATH
set path=/home/jahier/lurette/i386-linux-gcc3/bin:$path
set PATH=/home/jahier/lurette/i386-linux-gcc3/bin:$PATH
set PS_VIEWER=gv
set DOT=dot