Commit dbc00f74 authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.133 Thu, 17 Apr 2003 13:22:44 +0200 by jahier

Parent-Version:      0.132
Version-Log:

source/gen_stubs.ml:
source/ocaml2C.idl:
   use double instead of floats at the C level.

Project-Description: Lurette
parent 557de1e9
......@@ -7,11 +7,11 @@
(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 5743 1050421093 d/22_TODO 1.11)
(TODO 5818 1050578564 d/22_TODO 1.12)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/ne.mli 2138 1050421093 c/22_ne.mli 1.6)
(polka/documentation/polka.texi 109061 1047029868 e/17_polka.texi 1.1)
(source/ocaml2c.idl 1480 1049961831 e/26_ocaml2c.id 1.1)
(source/ocaml2c.idl 1484 1050578564 e/26_ocaml2c.id 1.2)
(demo/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(cuddaux/Changes 42 1034006019 c/36_Changes 1.1)
(mlcuddidl/idd.idl 10595 1034006019 d/1_idd.idl 1.1)
......@@ -20,9 +20,9 @@
(source/solver.ml 31036 1050421093 39_solver.ml 1.47)
(ihm/xlurette/makefile 1589 1050421093 c/16_makefile 1.9)
(polka/C/internal.h 958 1047029868 e/0_internal.h 1.1)
(source/command_line.ml 5083 1046074449 b/20_command_li 1.12)
(source/command_line.ml 5079 1050578564 b/20_command_li 1.13)
(test/cudd_gc_problem.rif.exp 7881 1050421093 e/30_cudd_gc_pr 1.1)
(configure.in 2457 1049961831 d/11_configure. 1.3)
(configure.in 2589 1050578564 d/11_configure. 1.4)
(demo/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(make_lurette 1306 1034006019 27_make_luret 1.17)
......@@ -30,7 +30,7 @@
(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 2599 1050421093 b/41_Makefile.i 1.17)
(source/Makefile.lucky 2597 1050578564 b/41_Makefile.i 1.18)
(polka/README 1437 1047029868 e/19_README 1.1)
(polka/Makefile.depend 136 1047029868 d/30_Makefile.d 1.1)
(README 1887 1049961831 10_README 1.7)
......@@ -67,34 +67,35 @@
(ihm/xlurette/xlurette_glade_main.ml 29622 1050421093 c/12_xlurette_g 1.17)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 56058 1050421093 c/13_xlurette.g 1.11)
(ihm/xlurette/xlurette.glade 55225 1050578564 c/13_xlurette.g 1.12)
(mlcuddidl/manager_caml.c 39233 1034006019 c/45_manager_ca 1.1)
(test/tram_simple.h 1746 1013519411 b/25_tram_simpl 1.1)
(test/losange.luc 410 1046768487 d/27_losange.lu 1.2)
(test/time-ecrins.exp 8240 1050421093 d/21_time-ecrin 1.14)
(test/time-ecrins.exp 8538 1050578564 d/21_time-ecrin 1.15)
(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/Makefile.gen_fake_lutin 248 1036048863 d/17_Makefile.g 1.1)
(Makefile.common.source 261 1050578564 e/33_Makefile.c 1.1)
(source/Makefile.gen_fake_lutin 255 1050578564 d/17_Makefile.g 1.2)
(polka/C/Makefile 3528 1047029868 e/15_Makefile 1.1)
(test/giro/giro.luc 2755 1033738731 c/6_giro.ima 1.4)
(source/control.ml 4445 1036675177 c/4_control.ml 1.4)
(source/parse_env.mli 1196 1050421093 40_parse_env. 1.14)
(source/env_state.ml 22805 1050421093 51_env_state. 1.41)
(source/env_state.ml 22975 1050578564 51_env_state. 1.42)
(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 368 1037192189 d/14_Makefile.l 1.2)
(source/Makefile.lurettetop 375 1050578564 d/14_Makefile.l 1.3)
(mlcuddidl/manager.mli 7912 1034006019 c/46_manager.ml 1.1)
(source/prevar.mli 1005 1050421093 d/19_prevar.mli 1.3)
(mlcuddidl/idd.mli 5470 1034006019 c/51_idd.mli 1.1)
(source/call_lurette_main.c 322 1050421093 e/28_call_luret 1.1)
(polka/C/vector.c 13780 1047029868 e/3_vector.c 1.1)
(source/Makefile.lurette_lib 2159 1049961831 c/2_Makefile.l 1.17)
(source/Makefile.lurette_lib 2166 1050578564 c/2_Makefile.l 1.18)
(test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
(mlcuddidl/bdd.idl 18233 1034006019 d/7_bdd.idl 1.1)
(polka/caml/polka_parser.mly 1729 1047029868 d/40_polka_pars 1.1)
(user-rules.skel 1370 1049961831 c/25_user-rules 1.4)
(source/gen_stubs.ml 21410 1050421093 24_generate_l 1.44)
(user-rules.skel 1730 1050578564 c/25_user-rules 1.5)
(source/gen_stubs.ml 21412 1050578564 24_generate_l 1.45)
(polka/C/pkint.h 6036 1047029868 e/12_pkint.h 1.1)
(polka/caml/vector.idl 8669 1047029868 d/35_vector.idl 1.1)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
......@@ -113,16 +114,16 @@
(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 8243 1050421093 b/49_time.res 1.40)
(test/time-ossau.res 6494 1050578564 b/49_time.res 1.41)
(source/automata.ml 19223 1046682069 b/47_automata.m 1.7)
(demo/chaudiere/chaudiere_ctrl.lus 177 1031732392 c/9_chaudiere_ 1.1)
(Makefile 1398 1049961831 d/13_Makefile 1.2)
(Makefile 1437 1050578564 d/13_Makefile 1.3)
(test/vrai_tram.c 3060 1027066799 b/8_vrai_tram. 1.3)
(cuddaux/cuddauxBridge.c 6099 1034006019 c/31_cuddauxBri 1.1)
(test/heater_float.rif.exp 1040 1047029868 b/30_heater_flo 1.13)
(cuddaux/Makefile 3165 1050421093 c/35_Makefile 1.3)
(cuddaux/Makefile 3136 1050578564 c/35_Makefile 1.4)
(polka/C/bit.c 3026 1047029868 e/10_bit.c 1.1)
(test/time-ossau.exp 8243 1050421093 b/48_time.exp 1.37)
(test/time-ossau.exp 6494 1050578564 b/48_time.exp 1.38)
(source/print.ml 5787 1045558187 47_print.ml 1.22)
(mlcuddidl/macros.m4 11290 1034006019 c/49_macros.m4 1.1)
(test/vrai_tram.h 2468 1027066799 b/7_vrai_tram. 1.3)
......@@ -140,8 +141,8 @@
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 35669 1050421093 c/15_xlurette_g 1.11)
(test/losange-3d2.luc 368 1050421093 e/32_losange-3d 1.1)
(test/Makefile 86 1049961831 c/0_Makefile 1.10)
(user-rules 21195 1050421093 c/14_myrules 1.30)
(test/Makefile 98 1050578564 c/0_Makefile 1.11)
(user-rules 23749 1050578564 c/14_myrules 1.31)
(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)
......@@ -153,7 +154,7 @@
(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 22830 1049961831 17_OcamlMakef 1.48)
(OcamlMakefile 22837 1050578564 17_OcamlMakef 1.49)
(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)
......@@ -174,22 +175,22 @@
(cuddaux/cuddauxInt.h 2058 1034006019 c/28_cuddauxInt 1.1)
(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 212 1036048863 b/42_Makefile.g 1.5)
(source/Makefile.gen_stubs 219 1050578564 b/42_Makefile.g 1.6)
(test/temp_float.luc 743 1046682069 b/51_temp_float 1.6)
(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)
(polka/C/polka.h 1478 1047029868 d/50_polka.h 1.1)
(source/command_line_luc_exe.ml 3535 1050421093 b/33_command_li 1.13)
(Makefile.lurette 647 1050421093 b/38_Makefile.l 1.19)
(source/command_line_luc_exe.ml 3533 1050578564 b/33_command_li 1.14)
(Makefile.lurette 792 1050578564 b/38_Makefile.l 1.20)
(source/lurette_exe.c 220 1050421093 e/27_lurette_ex 1.2)
(source/env.ml 7849 1050421093 16_env.ml 1.30)
(test/time-ecrins.res 8240 1050421093 d/20_time-ecrin 1.14)
(test/time-ecrins.res 8538 1050578564 d/20_time-ecrin 1.15)
(source/value.mli 1100 1049961831 c/24_value.mli 1.2)
(lucky_init.sh.in 359 1049961831 e/24_lucky_init 1.2)
(polka/Makefile.config 1674 1050421093 e/20_Makefile.c 1.2)
(polka/Makefile.config 1644 1050578564 e/20_Makefile.c 1.3)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 5234 1050421093 c/20_Makefile 1.12)
(source/Makefile 6434 1050578564 c/20_Makefile 1.13)
(source/graph.ml 2339 1037625990 14_graph.ml 1.8)
(test/cudd_gc_problem.luc 227680 1050421093 e/29_cudd_gc_pr 1.1)
(test/losange-3d.rif.exp 2675 1050421093 e/31_losange-3d 1.1)
......@@ -198,16 +199,16 @@
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
(source/luc_exe.ml 13997 1050421093 b/32_ima_exe.ml 1.30)
(source/gne.mli 1557 1046682069 b/36_gne.mli 1.5)
(source/lurette.ml 17515 1050421093 12_lurette.ml 1.65)
(source/lurette.ml 17588 1050578564 12_lurette.ml 1.66)
(polka/C/Makefile.depend 1081 1047029868 d/46_Makefile.d 1.1)
(lurette.dep.dot 49 1007651448 b/4_lurette.de 1.2)
(doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
(cuddaux/cuddauxCompose.c 13638 1034006019 c/30_cuddauxCom 1.1)
(source/gen_fake_lutin.ml 3520 1047029868 d/16_gen_fake_l 1.2)
(source/gen_fake_lutin.ml 3521 1050578564 d/16_gen_fake_l 1.3)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(polka/Makefile 1636 1047029868 e/21_Makefile 1.1)
(Makefile.common.in 233 1049961831 d/12_Makefile.c 1.4)
(test/porte.luc 996 1049961831 b/16_porte.env 1.10)
(source/eval.mli 1265 1050421093 48_eval.mli 1.11)
(source/Makefile.show_luc 1026 1037192189 b/40_Makefile.s 1.8)
(mlcuddidl/Makefile 7238 1050421093 d/9_Makefile 1.3)
(source/Makefile.show_luc 1033 1050578564 b/40_Makefile.s 1.9)
(mlcuddidl/Makefile 7207 1050578564 d/9_Makefile 1.4)
......@@ -23,9 +23,9 @@
# Where to install bins, libs, and include files
BIN_INSTALL_DIR = $(LURETTE_PATH)/bin
LIB_INSTALL_DIR = $(LURETTE_PATH)/lib
INC_INSTALL_DIR = $(LURETTE_PATH)/include
BIN_INSTALL_DIR = $(LURETTE_PATH)/$(HOST_TYPE)/bin
LIB_INSTALL_DIR = $(LURETTE_PATH)/$(HOST_TYPE)/lib
INC_INSTALL_DIR = $(LURETTE_PATH)/$(HOST_TYPE)/include
INCDIRS = $(LURETTE_PATH)/$(HOST_TYPE)/lib /home/jahier/lib
LIBDIRS = $(LURETTE_PATH)/$(HOST_TYPE)/lib /home/jahier/lib
......
#
# Makefile.common for building binaries
#
#
# Where to find libs
INCDIRS = /home/jahier/$(HOSTTYPE)/lib
LIBDIRS = /home/jahier/$(HOSTTYPE)/lib
HOST_TYPE=i386-linux
OCAMLMAKEFILE = /home/jahier/lurette/OcamlMakefile
LURETTE_PATH = /home/jahier/lurette
......@@ -6,25 +6,28 @@
#
# LURETTE_PATH ougth to be set by users
-include $(LURETTE_PATH)/Makefile.common
-include $(LURETTE_PATH)/Makefile.common.$(HOSTTYPE)
INCLUDEDIRS = -I$(LURETTE_PATH)/include -I$(USER_TESTING_DIR)
INCLUDEDIRS = -I$(LURETTE_PATH)/$(HOSTTYPE)/include -I$(USER_TESTING_DIR)
LIBDIRS = -L$(LURETTE_PATH)/$(HOST_TYPE)/lib
LIBS = -lgmp -lm -ldl
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
$(CC) -g -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SOURCES_C) $(LIBS) -lnsl -lsocket -llurette_lib_bc
dc:
$(CC) -g -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SOURCES_C) $(LIBS) -lnsl -lsocket -llurette_lib_dc
nc:
$(CC) -g -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SOURCES_C) $(LIBS) -llurette_lib_nc
$(CC) -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SOURCES_C) $(LIBS) -llurette_lib_nc
all: nc
......
......@@ -5,14 +5,14 @@
# For updates see:
# http://www.oefai.at/~markus/ocaml_sources
#
# $Id: OcamlMakefile 1.48 Thu, 10 Apr 2003 10:03:51 +0200 jahier $
# $Id: OcamlMakefile 1.49 Thu, 17 Apr 2003 13:22:44 +0200 jahier $
#
###########################################################################
# Set these variables to the names of the sources to be processed and
# the result variable. Order matters during linkage!
-include $(LURETTE_PATH)/Makefile.common
-include $(LURETTE_PATH)/Makefile.common.source
SOURCES_LURETTE_LIB = \
$(LURETTE_PATH)/source/util.ml \
......
......@@ -19,6 +19,7 @@
* Mettre a jour le parseur wrt les modifs que j'ai faite a la syntax
(noeuds transiants/stationnaires + formula = ...)
* rajouter une commande plot qui fasse appel a gnuplot plut qu'a sim2chro.
* Repasser a une notation infixée pour le format lucky. Ne pas faire
la verif de type en meme temps que le parsing ->
......
......@@ -82,12 +82,16 @@ fi
AC_OUTPUT(Makefile.common lucky_init.sh lucky_init.csh)
mv Makefile.common Makefile.common.$HOSTTYPE
mv lucky_init.sh lucky_init.sh.$HOSTTYPE
mv lucky_init.csh lucky_init.csh.$HOSTTYPE
echo " Do not forget to do a "
echo " source lucky_init.sh "
echo " source lucky_init.sh.$HOSTTYPE "
echo " or"
echo " source lucky_init.csh"
echo " (if you are using csh) "
echo " before using Lucky tools."
echo " source lucky_init.csh.$HOSTTYPE"
echo " if you are using csh, before using Lucky tools."
echo
echo " You migth wish to add \"source lucky_init.sh\" (resp\"source lucky_init.sh\") "
echo " in your .bashrc (resp .cshrc)."
......
......@@ -15,15 +15,15 @@ SRCDIR = $(shell pwd)
CUDD_INSTALL = /home/jahier/$(HOSTTYPE)
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := $(LURETTE_PATH)/$(HOSTTYPE)/bin
BIN_INSTALL_DIR := ~/$(HOSTTYPE)/bin
endif
ifndef INC_INSTALL_DIR
INC_INSTALL_DIR := $(LURETTE_PATH)/include
INC_INSTALL_DIR := ~/$(HOSTTYPE)/include
endif
ifndef LIB_INSTALL_DIR
LIB_INSTALL_DIR := $(LURETTE_PATH)/$(HOSTTYPE)/lib
LIB_INSTALL_DIR := ~/$(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
......
......@@ -611,48 +611,6 @@
<text></text>
</widget>
</widget>
<widget>
<class>GtkPreview</class>
<name>preview5</name>
<type>True</type>
<expand>False</expand>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
</widget>
<widget>
<class>GtkPreview</class>
<name>preview6</name>
<type>True</type>
<expand>False</expand>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
</widget>
</widget>
</widget>
......@@ -1843,14 +1801,19 @@
</widget>
<widget>
<class>GtkPreview</class>
<name>preview3</name>
<type>True</type>
<expand>False</expand>
<class>GtkLabel</class>
<name>label27</name>
<label>This page does not work yet, sorry</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
<fill>False</fill>
</child>
</widget>
</widget>
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 132)
(Parent-Version lurette 0 131)
(Project-Version lurette 0 133)
(Parent-Version lurette 0 132)
(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.
source/gen_stubs.ml:
source/ocaml2C.idl:
use double instead of floats at the C level.
")
(New-Version-Log ""
)
(Checkin-Time "Tue, 15 Apr 2003 17:38:13 +0200")
(Checkin-Time "Thu, 17 Apr 2003 13:22:44 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -49,14 +25,14 @@ Add the possibility to give default vales to pre variables.
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.2 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.30 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.13 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.14 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.10 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.13 644))
(source/lurette.ml (lurette/12_lurette.ml 1.65 644))
(source/lurette.ml (lurette/12_lurette.ml 1.66 644))
(source/command_line.ml (lurette/b/20_command_li 1.12 644))
(source/command_line.ml (lurette/b/20_command_li 1.13 644))
(source/command_line.mli (lurette/b/21_command_li 1.11 644))
;; Sources files common to lurette and luc_exe
......@@ -96,7 +72,7 @@ Add the possibility to give default vales to pre variables.
(source/eval.ml (lurette/49_eval.ml 1.14 644))
(source/env_state.mli (lurette/50_env_state. 1.29 644))
(source/env_state.ml (lurette/51_env_state. 1.41 644))
(source/env_state.ml (lurette/51_env_state. 1.42 644))
(source/automata.mli (lurette/b/46_automata.m 1.3 644))
(source/automata.ml (lurette/b/47_automata.m 1.7 644))
......@@ -108,7 +84,7 @@ Add the possibility to give default vales to pre variables.
(source/gne.ml (lurette/b/37_gne.ml 1.5 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.30 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.44 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.45 644))
(source/control.mli (lurette/c/3_control.ml 1.3 644))
(source/control.ml (lurette/c/4_control.ml 1.4 644))
......@@ -127,10 +103,10 @@ Add the possibility to give default vales to pre variables.
(source/parse_poc.ml (lurette/d/15_parse_poc. 1.2 644))
(source/parse_poc.mli (lurette/d/29_parse_poc. 1.1 644))
(source/gen_fake_lutin.ml (lurette/d/16_gen_fake_l 1.2 644))
(source/gen_fake_lutin.ml (lurette/d/16_gen_fake_l 1.3 644))
(source/show_luc.ml (lurette/e/25_show_luc.m 1.2 644))
(source/ocaml2c.idl (lurette/e/26_ocaml2c.id 1.1 644))
(source/ocaml2c.idl (lurette/e/26_ocaml2c.id 1.2 644))
(source/lurette_exe.c (lurette/e/27_lurette_ex 1.2 644))
(source/call_lurette_main.c (lurette/e/28_call_luret 1.1 644))
......@@ -139,21 +115,21 @@ Add the possibility to give default vales to pre variables.
(make_lurette (lurette/27_make_luret 1.17 755))
;; Make files
(configure.in (lurette/d/11_configure. 1.3 644))
(configure.in (lurette/d/11_configure. 1.4 644))
(Makefile.common.in (lurette/d/12_Makefile.c 1.4 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.48 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.19 644))
(user-rules (lurette/c/14_myrules 1.30 644))
(user-rules.skel (lurette/c/25_user-rules 1.4 644))
(Makefile (lurette/d/13_Makefile 1.2 644))
(source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.2 644))
(source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.1 644))
(source/Makefile.show_luc (lurette/b/40_Makefile.s 1.8 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.17 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.5 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.17 644))
(source/Makefile (lurette/c/20_Makefile 1.12 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.49 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.20 644))
(user-rules (lurette/c/14_myrules 1.31 644))
(user-rules.skel (lurette/c/25_user-rules 1.5 644))
(Makefile (lurette/d/13_Makefile 1.3 644))
(source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.3 644))
(source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.2 644))
(source/Makefile.show_luc (lurette/b/40_Makefile.s 1.9 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.18 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.6 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.18 644))
(source/Makefile (lurette/c/20_Makefile 1.13 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -169,15 +145,15 @@ Add the possibility to give default vales to pre variables.
(lurette.dep.dot (lurette/b/4_lurette.de 1.2 644))
(lurette.depfull.dot (lurette/b/5_lurette.de 1.2 644))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.11 644))
(TODO (lurette/d/22_TODO 1.12 644))
(lucky_init.csh.in (lurette/e/23_lucky_init 1.2 644))
(lucky_init.sh.in (lurette/e/24_lucky_init 1.2 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.37 644))
(test/time-ossau.res (lurette/b/49_time.res 1.40 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.14 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.14 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.38 644))
(test/time-ossau.res (lurette/b/49_time.res 1.41 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.15 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.15 644))
;; Various files used for testing purposes
(test/cudd_gc_problem.luc (lurette/e/29_cudd_gc_pr 1.1 644))
......@@ -219,11 +195,11 @@ Add the possibility to give default vales to pre variables.
(test/losange-3d.luc (lurette/d/28_losange-3d 1.2 644))
(test/losange-3d.rif.exp (lurette/e/31_losange-3d 1.1 644))
(test/Makefile (lurette/c/0_Makefile 1.10 644))
(test/Makefile (lurette/c/0_Makefile 1.11 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.17 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.11 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.12 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.11 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.9 644))
......@@ -238,7 +214,7 @@ Add the possibility to give default vales to pre variables.
(cuddaux/cuddauxAddIte.c (lurette/c/32_cuddauxAdd 1.1 644))
(cuddaux/cuddaux.h (lurette/c/33_cuddaux.h 1.1 644))
(cuddaux/README (lurette/c/34_README 1.1 644))
(cuddaux/Makefile (lurette/c/35_Makefile 1.3 644))
(cuddaux/Makefile (lurette/c/35_Makefile 1.4 644))
(cuddaux/Changes (lurette/c/36_Changes 1.1 644))
......@@ -267,7 +243,7 @@ Add the possibility to give default vales to pre variables.
(mlcuddidl/bdd.ml (lurette/d/6_bdd.ml 1.1 640))
(mlcuddidl/bdd.idl (lurette/d/7_bdd.idl 1.1 644))
(mlcuddidl/README (lurette/d/8_README 1.1 644))
(mlcuddidl/Makefile (lurette/d/9_Makefile 1.3 644))
(mlcuddidl/Makefile (lurette/d/9_Makefile 1.4 644))
(mlcuddidl/Changes (lurette/d/10_Changes 1.1 644))
;; polka
......@@ -314,7 +290,7 @@ Add the possibility to give default vales to pre variables.
(polka/documentation/polka.texi (lurette/e/17_polka.texi 1.1 644))
(polka/documentation/Makefile (lurette/e/18_Makefile 1.1 644))
(polka/README (lurette/e/19_README 1.1 644))
(polka/Makefile.config (lurette/e/20_Makefile.c 1.2 644))
(polka/Makefile.config (lurette/e/20_Makefile.c 1.3 644))
(polka/Makefile (lurette/e/21_Makefile 1.1 644))
(polka/Changes (lurette/e/22_Changes 1.1 644))
......@@ -327,6 +303,11 @@ Add the possibility to give default vales to pre variables.
;; to version 0.131(w), by jahier:
(test/losange-3d2.luc (lurette/e/32_losange-3d 1.1 644))
;; Files added by populate at Thu, 17 Apr 2003 13:15:11 +0200,
;; to version 0.132(w), by jahier:
(Makefile.common.source (lurette/e/33_Makefile.c 1.1 644))
)
(Merge-Parents)
(New-Merge-Parents)
......@@ -15,15 +15,15 @@ CUDD_INSTALL = /home/jahier/$(HOSTTYPE)
# Where to install libs
#
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := $(LURETTE_PATH)/$(HOSTTYPE)/bin
BIN_INSTALL_DIR := ~/$(HOSTTYPE)/bin
endif
ifndef INC_INSTALL_DIR
INC_INSTALL_DIR := $(LURETTE_PATH)/include
INC_INSTALL_DIR := ~/$(HOSTTYPE)/include
endif
ifndef LIB_INSTALL_DIR
LIB_INSTALL_DIR := $(LURETTE_PATH)//$(HOSTTYPE)/lib
LIB_INSTALL_DIR := ~/$(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
......
......@@ -11,9 +11,9 @@ CAMLIDL_INSTALL = /home/jahier/$(HOSTTYPE)
PREFIX = $(POLKA_INSTALL)
# C include and lib directories
INCDIR = $(LURETTE_PATH)/include
LIBDIR = $(LURETTE_PATH)/$(HOSTTYPE)/lib
BINDIR = $(LURETTE_PATH)/$(HOSTTYPE)/bin
INCDIR = ~/$(HOSTTYPE)/include
LIBDIR = ~/$(HOSTTYPE)/lib
BINDIR = ~/$(HOSTTYPE)/bin
#
# Where to find GMP (here, $(GMP_INSTALL)/include, $(GMP_INSTALL)/lib)
......
-include ../Makefile.common
-include ../Makefile.common.source
ifndef INSTALL_DIR
INSTALL_DIR := ..
......@@ -7,34 +7,34 @@ endif
BIN_INSTALL_DIR = $(LURETTE_PATH)/$(HOSTTYPE)/bin
LIB_INSTALL_DIR = $(LURETTE_PATH)/$(HOSTTYPE)/lib
INC_INSTALL_DIR = $(LURETTE_PATH)/include
INC_INSTALL_DIR = $(LURETTE_PATH)/$(HOSTTYPE)/include
liblurette_lib_nc.a:
cd lurette_util ;\
ar rcs liblurette_lib_nc.a ../lurette_lib.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libcudd_caml.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libcudd_caml.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libcuddaux.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libcuddaux.a ;\
ar r liblurette_lib_nc.a ../lurette_lib.o *.o ; rm *.o ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libcudd.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libpolkag_caml.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libpolkag_caml.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libpolkag.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libpolkag.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libcamlidl.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libcamlidl.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libmtr.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libmtr.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libst.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libst.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/$(HOSTTYPE)/lib/libepd.a ;\
ar x /home/jahier/$(HOSTTYPE)/lib/libepd.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\