Commit 557de1e9 authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.132 Tue, 15 Apr 2003 17:38:13 +0200 by jahier

Parent-Version:      0.131
Version-Log:

Fix 3 bugs discovered by Pascal.

one was due to a confusion with variable starting with _pre
during formula_to_string.

another one was in store.ml: i was not reinjecting the solutions
when retriving values from store.substl

a third one was due to the fact that I was not applying substitution
rigth-to-left whereas I should.

source/luc_exe.ml:
   Add 2 options --help and --step-number that let one set a bound
   on the number of steps to perform.

source/env.ml:
source/parse_env.ml:
   Provide a mean to give default values to pre variables.

ihm/xlurette/xlurette_glade_main.ml
ihm/xlurette/xlurette.glade:
  Add Combo boxes to browse lustre file nodes.

source/
Add the possibility to give default vales to pre variables.

Project-Description: Lurette
parent c6d9a1c3
This diff is collapsed.
......@@ -18,6 +18,8 @@ LIBS = -lgmp -lm -ldl
SOURCES_C = ocaml2c_stubs.c $(SUT) lurette__sut.c $(ORACLE) lurette__oracle.c lurette_exe.c call_lurette_main.c
bc:
$(CC) -g -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SOURCES_C) $(LIBS) -llurette_lib_bc
......
......@@ -5,28 +5,24 @@
*********** A faire maintenant
* ajouter une option give-fake-default-to-pre
* attention, le nom des fichiers generes les outils lustre (lus2ec, ec2c)
se basent sur le nom du noeud, pas sur le nom du fichier.
* verifier le gen_fake_lutin dans xlurette (devrait etre appele via
lurettetop, pour l'instant, il y a duplication ...)
* Il faudrait pouvoir browser le nom des noeuds d'un fichier lustre
depuis l'interface graphique (lusinfo).
* Utiliser l'ordre des parametres plutot que leur noms
Quoique, quand on fait le produit de plusieur automates,
Quoique, quand on fait le produit de plusieurs automates,
ca n'est guere pratique...
--> 2 options : --var-order (default), --var-name
* rajouter une option qui dit si les formules doivent etre tronquees
dans show_luc
* Mettre a jour le parseur wrt les modifs que j'ai faite a la syntax
(noeuds transiants/stationnaires + formula = ...)
* Repasser a une notation infixée pour le format lucky. Ne pas faire
la verif de type en meme temps que le parsing ->
(1) Portage pour scade et esterel windows ...
-> structure, tableau, types structures, etc.
......@@ -51,8 +47,6 @@ depuis l'interface graphique (lusinfo).
* remplacer l'epaisseur de formules par un taux de couverture
* rajouter une option qui dit si les formules doivent etre tronquees
dans show_luc
......@@ -91,8 +85,6 @@ depuis l'interface graphique (lusinfo).
-> tester si gtk est la
* inclure ocaml.opt et camlidl dans la distrib ???
* Chercher a detecter des egalites lors de l'ajout d'une inegalité.
(cf code commenter dans store.ml)
......
......@@ -12,10 +12,10 @@ SRCDIR = $(shell pwd)
#
# XXX autoconf
CUDD_INSTALL = /home/jahier
CUDD_INSTALL = /home/jahier/$(HOSTTYPE)
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := $(LURETTE_PATH)/$(OSTYPE)/bin
BIN_INSTALL_DIR := $(LURETTE_PATH)/$(HOSTTYPE)/bin
endif
ifndef INC_INSTALL_DIR
......@@ -23,7 +23,7 @@ ifndef INC_INSTALL_DIR
endif
ifndef LIB_INSTALL_DIR
LIB_INSTALL_DIR := $(LURETTE_PATH)/$(OSTYPE)/lib
LIB_INSTALL_DIR := $(LURETTE_PATH)/$(HOSTTYPE)/lib
endif
......@@ -39,8 +39,8 @@ ICFLAGS = \
#
# XCFLAGS should be the same than the one with which CUDD is compiled
#
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
# XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
#XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
CFLAGS = $(ICFLAGS) $(XCFLAGS) -O3 -DNDEBUG
CFLAGS_DEBUG = $(ICFLAGS) $(XCFLAGS) -O1 -g -UNDEBUG
......
......@@ -3,7 +3,7 @@
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := ../../$(OSTYPE)/bin
BIN_INSTALL_DIR := ../../$(HOSTTYPE)/bin
endif
......@@ -16,7 +16,7 @@ xlurette: dummy
ocamlc -c -i -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlc -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlc $(THREAD) \
-I +lablgtk -I +str -o xlurette str.cma unix.cma lablgtk.cma gtkInit.cmo util.cmo \
-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
......@@ -24,7 +24,7 @@ xlurette.opt: dummy
ocamlopt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx util.cmx \
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
......@@ -32,7 +32,7 @@ xlurette.opt_opt: dummy
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -pp "camlp4o" -c -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -linkall -I +lablgtk -I +str -labels -o xlurette str.cmxa unix.cmxa lablgtk.cmxa gtkInit.cmx util.cmx \
ocamlopt.opt -linkall -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
......
This diff is collapsed.
......@@ -51,24 +51,6 @@ let table2 = GPack.table
~packing:frame1#add
()
in
let env_name = GEdit.entry
~packing:(table2#attach ~left:1
~top:1
~right:2
~bottom:2
~xpadding:0
~ypadding:0
~expand:`X
~shrink:`NONE
~fill:`X
)
~max_length:0
~visibility:true
~editable:true
()
in
let _ = GtkBase.Widget.set_can_focus env_name#as_widget true in
let _ = tooltips#set_tip ~text:"Enter the enviroment file names (eventually separated by `x' in you want to perform the automata product) e.g., tram.ima x door.ima user.ima" env_name#coerce in
let show_env_button = GButton.button
~packing:(table2#attach ~left:0
~top:1
......@@ -302,30 +284,46 @@ let hbox13 = GPack.hbox
)
()
in
let sut_name = GEdit.entry
let eventbox1 = GBin.event_box
~packing:(hbox13#pack ~padding:0
~fill:true
~expand:true
)
~max_length:0
~visibility:true
~editable:true
()
in
let sut_name = GEdit.combo
~packing:eventbox1#add
~value_in_list:false
~ok_if_empty:true
~case_sensitive:false
~use_arrows:`DEFAULT
()
in
let sut_name_entry = sut_name#entry
in
let _ = GtkBase.Widget.set_can_focus sut_name#as_widget true in
let _ = tooltips#set_tip ~text:"Name of the file of the system under test (MANDATORY)" sut_name#coerce in
let sut_node = GEdit.entry
let _ = tooltips#set_tip ~text:"Name of the program under test" sut_name#coerce in
let _ = sut_name_entry#set_editable true in
let _ = sut_name_entry#set_visibility true in
let _ = sut_name_entry#set_max_length 0 in
let combo2 = GEdit.combo
~packing:(hbox13#pack ~padding:0
~fill:true
~expand:true
)
~max_length:0
~visibility:true
~editable:true
~value_in_list:false
~ok_if_empty:true
~case_sensitive:false
~use_arrows:`DEFAULT
()
in
let _ = GtkBase.Widget.set_can_focus sut_node#as_widget true in
let _ = tooltips#set_tip ~text:"Main node name" sut_node#coerce in
let sut_node = combo2#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 hbox14 = GPack.hbox
~spacing:0
~homogeneous:false
......@@ -341,30 +339,66 @@ let hbox14 = GPack.hbox
)
()
in
let oracle_name = GEdit.entry
let oracle_name = GEdit.combo
~packing:(hbox14#pack ~padding:0
~fill:true
~expand:true
)
~max_length:0
~visibility:true
~editable:true
~value_in_list:false
~ok_if_empty:true
~case_sensitive:false
~use_arrows:`DEFAULT
()
in
let oracle_name_entry = oracle_name#entry
in
let _ = GtkBase.Widget.set_can_focus oracle_name#as_widget true in
let _ = tooltips#set_tip ~text:"Name of the oracle file (MANDATORY)" oracle_name#coerce in
let oracle_node = GEdit.entry
let _ = tooltips#set_tip ~text:"Name of the oracle file (if any)" oracle_name#coerce in
let _ = oracle_name_entry#set_editable true in
let _ = oracle_name_entry#set_visibility true in
let _ = oracle_name_entry#set_max_length 0 in
let oracle_node = GEdit.combo
~packing:(hbox14#pack ~padding:0
~fill:true
~expand:true
)
~max_length:0
~visibility:true
~editable:true
~value_in_list:false
~ok_if_empty:true
~case_sensitive:false
~use_arrows:`DEFAULT
()
in
let combo_entry3 = oracle_node#entry
in
let _ = GtkBase.Widget.set_can_focus oracle_node#as_widget true in
let _ = tooltips#set_tip ~text:"Oracle main node name" oracle_node#coerce 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 env_name = GEdit.combo
~packing:(table2#attach ~left:1
~top:1
~right:2
~bottom:2
~xpadding:0
~ypadding:0
~expand:`X
~shrink:`NONE
~fill:`X
)
~value_in_list:false
~ok_if_empty:true
~case_sensitive:false
~use_arrows:`DEFAULT
()
in
let env_name_entry = env_name#entry
in
let _ = GtkBase.Widget.set_can_focus env_name#as_widget true in
let _ = tooltips#set_tip ~text:"Environment file name" env_name#coerce in
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
~hpolicy:`AUTOMATIC
~vpolicy:`AUTOMATIC
......@@ -640,7 +674,6 @@ let rif_file = GEdit.entry
~shrink:`NONE
~fill:`X
)
~text: "lurette.rif"
~max_length:0
~visibility:true
~editable:true
......@@ -649,7 +682,7 @@ in
let _ = GtkBase.Widget.set_can_focus rif_file#as_widget true in
let _ = tooltips#set_tip ~text:"Name of file the test results is put in" rif_file#coerce in
let save_session_label = GMisc.label
~text: "saved session "
~text: "saved session"
~packing:(table6#attach ~left:0
~top:4
~right:1
......@@ -1092,7 +1125,7 @@ in
let _ = GtkBase.Widget.set_can_focus toolbar3#as_widget true in
let _ = GtkBase.Widget.grab_focus toolbar3#as_widget in
let button14 = toolbar3#insert_button
~text: " "
~text: " "
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/chrono.xpm" ()) ())#coerce
()
in
......@@ -1118,6 +1151,76 @@ let parameters = GMisc.label
~line_wrap:false
()
in
let hbox15 = GPack.hbox
~spacing:0
~homogeneous:false
()
in
let vbox16 = GPack.vbox
~spacing:0
~homogeneous:false
~packing:(hbox15#pack ~padding:0
~fill:true
~expand:true
)
()
in
let scrolledwindow3 = GBin.scrolled_window
~hpolicy:`ALWAYS
~vpolicy:`ALWAYS
~packing:(vbox16#pack ~padding:0
~fill:true
~expand:true
)
()
in
let vbox15 = GPack.vbox
~spacing:0
~homogeneous:false
~packing:(hbox15#pack ~padding:0
~fill:true
~expand:true
)
()
in
let toolbar8 = GButton.toolbar
~packing:(vbox15#pack ~padding:0
~fill:false
~expand:false
)
~orientation:`VERTICAL
~button_relief:`NORMAL
~tooltips:true
~space_size:5
~border_width:2
~space_style:`EMPTY
()
in
let sim2chro = toolbar8#insert_button
~text: "sim2chro"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/chrono.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Call sim2chro with the selected file" sim2chro#coerce in
let delete_rif_button = toolbar8#insert_button
~text: "Delete"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/quit.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Delete selected file" delete_rif_button#coerce in
let time_diagrams_label = GMisc.label
~text: "Timing diagrams"
~xalign:0.5
~yalign:0.5
~xpad:0
~ypad:0
~line_wrap:false
()
in
let _ = delete_rif_button#connect#clicked
~callback:callbacks#on_delete_rif_button_clicked in
let _ = sim2chro#connect#clicked
~callback:callbacks#on_sim2chro_clicked in
let _ = button16#connect#clicked
~callback:callbacks#quit in
let _ = button15#connect#clicked
......@@ -1136,9 +1239,9 @@ let _ = button18#connect#clicked
~callback:callbacks#call_sim2chro_clicked in
let _ = button17#connect#clicked
~callback:callbacks#run_lurette in
let _ = oracle_name#connect#changed
let _ = oracle_name_entry#connect#changed
~callback:callbacks#on_oracle_name_changed in
let _ = sut_name#connect#changed
let _ = sut_name_entry#connect#changed
~callback:callbacks#on_sut_name_changed in
let _ = button33#connect#clicked
~callback:callbacks#browse_oracle_clicked in
......@@ -1159,7 +1262,6 @@ method run_panel = run_panel
method vpaned2 = vpaned2
method frame1 = frame1
method table2 = table2
method env_name = env_name
method show_env_button = show_env_button
method oracle_label = oracle_label
method sut_label = sut_label
......@@ -1176,11 +1278,18 @@ method button32 = button32
method toolbar7 = toolbar7
method button33 = button33
method hbox13 = hbox13
method eventbox1 = eventbox1
method sut_name = sut_name
method sut_node = sut_node
method sut_name_entry = sut_name
method combo2 = combo2
method sut_node = combo2
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 env_name = env_name
method env_name_entry = env_name
method scrolledwindow2 = scrolledwindow2
method output_window = output_window
method hbox1 = hbox1
......@@ -1242,8 +1351,18 @@ method button14 = button14
method button15 = button15
method button16 = button16
method parameters = parameters
method hbox15 = hbox15
method vbox16 = vbox16
method scrolledwindow3 = scrolledwindow3
method vbox15 = vbox15
method toolbar8 = toolbar8
method sim2chro = sim2chro
method delete_rif_button = delete_rif_button
method time_diagrams_label = time_diagrams_label
initializer callbacks#set_xlurette self;
notebook1#prepend_page
~tab_label:time_diagrams_label#coerce hbox15#coerce;
notebook1#prepend_page
~tab_label:parameters#coerce option_panel#coerce;
notebook1#prepend_page
~tab_label:label9#coerce run_panel#coerce;
......
This diff is collapsed.
This diff is collapsed.
......@@ -8,14 +8,14 @@ SRCDIR = $(PWD)
#
# XXX autoconf !!!
CAML_INSTALL = /home/jahier
CUDD_INSTALL = /home/jahier
CAML_INSTALL = /home/jahier/$(HOSTTYPE)
CUDD_INSTALL = /home/jahier/$(HOSTTYPE)
#
# Where to install libs
#
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := $(LURETTE_PATH)/$(OSTYPE)/bin
BIN_INSTALL_DIR := $(LURETTE_PATH)/$(HOSTTYPE)/bin
endif
ifndef INC_INSTALL_DIR
......@@ -23,7 +23,7 @@ ifndef INC_INSTALL_DIR
endif
ifndef LIB_INSTALL_DIR
LIB_INSTALL_DIR := $(LURETTE_PATH)/$(OSTYPE)/lib
LIB_INSTALL_DIR := $(LURETTE_PATH)//$(HOSTTYPE)/lib
endif
......@@ -73,8 +73,8 @@ ICFLAGS = \
#
# XCFLAGS should be the same than the flags with which CUDD has been compiled
#
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
# XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
# XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
CFLAGS = $(ICFLAGS) $(XCFLAGS) -O3 -DNDEBUG
CFLAGS_DEBUG = $(ICFLAGS) $(XCFLAGS) -O0 -g
......
......@@ -6,14 +6,14 @@
# Installation directory prefix
#
CAML_INSTALL = /home/jahier
CAMLIDL_INSTALL = /home/jahier
CAML_INSTALL = /home/jahier/$(HOSTTYPE)
CAMLIDL_INSTALL = /home/jahier/$(HOSTTYPE)
PREFIX = $(POLKA_INSTALL)
# C include and lib directories
INCDIR = $(LURETTE_PATH)/include
LIBDIR = $(LURETTE_PATH)/$(OSTYPE)/lib
BINDIR = $(LURETTE_PATH)/$(OSTYPE)/bin
LIBDIR = $(LURETTE_PATH)/$(HOSTTYPE)/lib
BINDIR = $(LURETTE_PATH)/$(HOSTTYPE)/bin
#
# Where to find GMP (here, $(GMP_INSTALL)/include, $(GMP_INSTALL)/lib)
......
......@@ -5,47 +5,83 @@ ifndef INSTALL_DIR
INSTALL_DIR := ..
endif
BIN_INSTALL_DIR = $(LURETTE_PATH)/$(HOSTTYPE)/bin
LIB_INSTALL_DIR = $(LURETTE_PATH)/$(HOSTTYPE)/lib
INC_INSTALL_DIR = $(LURETTE_PATH)/include
liblurette_lib_nc.a:
cd lurette_util ;\
ar rcs liblurette_lib_nc.a ../lurette_lib.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libcudd_caml.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libcudd_caml.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libcuddaux.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libcuddaux.a ;\
ar r liblurette_lib_nc.a ../lurette_lib.o *.o ; rm *.o ;\
ar x /home/jahier/lib/libcudd.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libcudd.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libpolkag_caml.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libpolkag_caml.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libpolkag.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libpolkag.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libcamlidl.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libcamlidl.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libmtr.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libmtr.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libst.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libst.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libepd.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libepd.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libutil.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libutil.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libstr.a ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libstr.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libasmrun.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/ocaml/libasmrun.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
cp liblurette_lib_nc.a ..
libnc: liblurette_lib_nc.a
liblurette_lib_bc.a:
cd lurette_util ;rm * ;\
ar rcs liblurette_lib_bc.a ../lurette_lib.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libcudd_caml.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libcuddaux.a ;\
ar r liblurette_lib_bc.a ../lurette_lib.o *.o ; rm *.o ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libcudd.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libpolkag_caml.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libpolkag.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libcamlidl.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libmtr.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libst.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libepd.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libutil.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libstr.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOSTTYPE)/lib/ocaml/libcamlrun.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
cp liblurette_lib_bc.a ..
libnc:
rm -f lurette_lib.o
make nc -f Makefile.lurette_lib OCAMLFLAGS="-noassert -unsafe"
rm -f liblurette_lib_nc.a
make liblurette_lib_nc.a
ar r liblurette_lib_nc.a lurette_lib.o
libbc:liblurette_lib_bc.a
libbc:
rm -f lurette_lib.o
make bc -f Makefile.lurette_lib OCAMLFLAGS=""
cp libcamlrun-$(HOST_TYPE).a liblurette_lib_bc.a
rm -f liblurette_lib_bc.a
make liblurette_lib_bc.a
ar r liblurette_lib_bc.a lurette_lib.o
libdc:liblurette_lib_dc.a
......@@ -68,6 +104,8 @@ lib_prof:liblurette_lib_prof.a
lucky:
make -k nc -f Makefile.lucky OCAMLFLAGS="-noassert -unsafe"
luckync:
make -k nc -f Makefile.lucky OCAMLFLAGS=""
lucky_bc:
make -k bc -f Makefile.lucky OCAMLFLAGS=""
lucky_debug:
......@@ -94,7 +132,7 @@ gen_lut:
make -k nc -f Makefile.gen_fake_lutin OCAMLFLAGS="-noassert -unsafe"
all: libnc lucky ltop show stubs gen_lut
all: libnc libbc lucky ltop show stubs gen_lut
clean_exe:
......@@ -117,6 +155,7 @@ cp:
cp *.cmi $(LIB_INSTALL_DIR) ;\
cp *.cmx $(LIB_INSTALL_DIR) ;\
cp liblurette_lib_nc.a $(LIB_INSTALL_DIR) ;\
cp liblurette_lib_bc.a $(LIB_INSTALL_DIR) ;\
cp ocaml2c.h $(INC_INSTALL_DIR)