Skip to content

GitLab

Commit 70fca1e8 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.103 Fri, 11 Oct 2002 17:50:55 +0200 by jahier 

Parent-Version:      0.102
Version-Log:

Add autoconf aupport.

Project-Description: Lurette
parent 9f892d0a
Hide whitespace changes
Inline Side-by-side
.lurette.prcs_aux
View file @ 70fca1e8
......@@ -3,7 +3,7 @@
(Created-By-Prcs-Version 1 3 3)
(source/automata.ml 15777 1033723811 b/47_automata.m 1.5)
(source/formula.mli 2805 1033397911 44_formula.ml 1.18)
(test/heater_float.lus 175 1020068208 b/44_heater_flo 1.1)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(test/passerelle.luc 984 1032789516 b/17_passerelle 1.8)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(test/temp_float.luc 728 1032789516 b/51_temp_float 1.3)
......@@ -22,9 +22,9 @@
(source/ne.ml 9140 1033723811 c/21_ne.ml 1.1)
(source/value.mli 1101 1033723811 c/24_value.mli 1.1)
(user-rules.skel 973 1034006019 c/25_user-rules 1.1)
(source/Makefile.gen_stubs 333 1034006019 b/42_Makefile.g 1.3)
(source/Makefile.gen_stubs 176 1034351455 b/42_Makefile.g 1.4)
(test/temp_int.luc 685 1033723811 b/50_temp_int.e 1.3)
(source/luc_exe.ml 12114 1033738731 b/32_ima_exe.ml 1.20)
(source/luc_exe.ml 12191 1034351455 b/32_ima_exe.ml 1.21)
(test/heater_float.rif.exp 1459 1034006019 b/30_heater_flo 1.10)
(source/graph.ml 2563 1027066799 14_graph.ml 1.7)
(ihm/xlurette/makefile 1283 1034006019 c/16_makefile 1.2)
......@@ -35,33 +35,33 @@
(source/eval.ml 7755 1027066799 49_eval.ml 1.13)
(source/env.ml 8013 1027349504 16_env.ml 1.29)
(demo/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
(source/Makefile.show_luc 976 1034006019 b/40_Makefile.s 1.6)
(source/Makefile.show_luc 937 1034351455 b/40_Makefile.s 1.7)
(source/env_state.mli 6734 1033125605 50_env_state. 1.24)
(mlcuddidl/idd.ml 7061 1034006019 d/0_idd.ml 1.1)
(source/print.mli 1145 1033397911 46_print.mli 1.12)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(test/Makefile 99 1034006019 c/0_Makefile 1.5)
(test/Makefile 100 1034351455 c/0_Makefile 1.6)
(source/parse_env.ml 24584 1033723811 41_parse_env. 1.29)
(ihm/xlurette/xlurette_glade_main.ml 16705 1032789516 c/12_xlurette_g 1.6)
(demo/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(source/solver.ml 31802 1033732198 39_solver.ml 1.32)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(source/lurette.ml 13532 1033738731 12_lurette.ml 1.54)
(source/Makefile 1021 1034006019 c/20_Makefile 1.4)
(source/util.ml 15664 1033723811 35_util.ml 1.27)
(source/Makefile 1050 1034351455 c/20_Makefile 1.5)
(source/util.ml 18633 1034351455 35_util.ml 1.28)
(mlcuddidl/manager.mli 7912 1034006019 c/46_manager.ml 1.1)
(test/time.res 5580 1034006019 b/49_time.res 1.15)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(source/sim2chro.mli 1455 1027943375 b/23_sim2chro.m 1.5)
(source/command_line_luc_exe.mli 1082 1034006019 b/34_command_li 1.5)
(source/Makefile.lucky 2303 1034006019 b/41_Makefile.i 1.5)
(source/Makefile.lucky 1987 1034351455 b/41_Makefile.i 1.6)
(TAGS 9825 1007379917 21_TAGS 1.6)
(test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1)
(mlcuddidl/rdd.ml 8746 1034006019 c/41_rdd.ml 1.1)
(source/Makefile.lurette_lib 2052 1034006019 c/2_Makefile.l 1.5)
(source/Makefile.lurette_lib 1726 1034351455 c/2_Makefile.l 1.6)
(source/parse_env.mli 1025 1033738731 40_parse_env. 1.10)
(source/gen_stubs.ml 34560 1033734088 24_generate_l 1.37)
(OcamlMakefile 22584 1034006019 17_OcamlMakef 1.43)
(source/gen_stubs.ml 33599 1034351455 24_generate_l 1.38)
(OcamlMakefile 22610 1034351455 17_OcamlMakef 1.44)
(source/command_line.ml 4625 1031053030 b/20_command_li 1.8)
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
(mlcuddidl/idd_caml.c 15964 1034006019 c/50_idd_caml.c 1.1)
......@@ -70,24 +70,25 @@
(make_lurette 1306 1034006019 27_make_luret 1.17)
(source/control.ml 4416 1030975996 c/4_control.ml 1.3)
(ihm/xlurette/xlurette_glade_interface.ml 28245 1032531447 c/15_xlurette_g 1.3)
(source/lurettetop.ml 24884 1033738731 c/1_lurettetop 1.12)
(source/lurettetop.ml 24587 1034351455 c/1_lurettetop 1.13)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(source/ne.mli 2376 1033723811 c/22_ne.mli 1.1)
(README 74 1011881677 10_README 1.2)
(README 1521 1034351455 10_README 1.3)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/env_state.ml 20707 1033125605 51_env_state. 1.29)
(mlcuddidl/manager_caml.c 39233 1034006019 c/45_manager_ca 1.1)
(mlcuddidl/mtbdd.mli 4395 1034006019 c/43_mtbdd.mli 1.1)
(source/env.mli 2027 1033738731 15_env.mli 1.16)
(mlcuddidl/rdd_caml.c 41613 1034006019 c/39_rdd_caml.c 1.1)
(user-rules 13974 1034006019 c/14_myrules 1.9)
(Makefile.common.in 600 1034351455 d/12_Makefile.c 1.1)
(user-rules 14331 1034351455 c/14_myrules 1.10)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(source/lurette.mli 448 1016027474 11_lurette.ml 1.12)
(source/gne.mli 1552 1033397911 b/36_gne.mli 1.4)
(test/giro/giro.luc 2755 1033738731 c/6_giro.ima 1.4)
(source/show_env.mli 1091 1033738731 42_show_env.m 1.8)
(Makefile.lurette 753 1034006019 b/38_Makefile.l 1.12)
(Makefile.lurette 647 1034351455 b/38_Makefile.l 1.13)
(source/luc_exe.mli 447 1033738731 b/31_ima_exe.ml 1.2)
(lurette.dep.dot 49 1007651448 b/4_lurette.de 1.2)
(mlcuddidl/bdd.idl 18233 1034006019 d/7_bdd.idl 1.1)
......@@ -96,8 +97,8 @@
(test/vrai_tram.c 3060 1027066799 b/8_vrai_tram. 1.3)
(source/command_line.mli 1442 1031053030 b/21_command_li 1.7)
(ihm/xlurette/xlurette.glade 43485 1032531447 c/13_xlurette.g 1.4)
(source/graph.mli 2218 1027066799 13_graph.mli 1.9)
(demo/chaudiere/chaudiere.luc 446 1032789516 c/11_chaudiere. 1.5)
(source/graph.mli 2218 1027066799 13_graph.mli 1.9)
(mlcuddidl/bdd_caml.c 57199 1034006019 d/4_bdd_caml.c 1.1)
(test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
(cuddaux/Changes 42 1034006019 c/36_Changes 1.1)
......@@ -123,8 +124,9 @@
(mlcuddidl/cudd_caml.c 22890 1034006019 d/3_cudd_caml. 1.1)
(source/print.ml 5807 1033723811 47_print.ml 1.21)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(configure.in 5208 1034351455 d/11_configure. 1.1)
(cuddaux/cuddauxBridge.c 6099 1034006019 c/31_cuddauxBri 1.1)
(source/show_env.ml 3603 1033738731 43_show_env.m 1.13)
(source/show_env.ml 3436 1034351455 43_show_env.m 1.14)
(mlcuddidl/Changes 64 1034006019 d/10_Changes 1.1)
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
(source/rnumsolver.mli 2198 1033732198 b/26_rnumsolver 1.9)
......
Makefile.common.in 0 → 100644
View file @ 70fca1e8
#
#
#
# Where the lurette source files are
LURETTE_PATH := @abs_srcdir@
# Where to install nibs, libs, and include files
BIN_INSTALL_DIR = $(LURETTE_PATH)/bin
LIB_INSTALL_DIR = $(LURETTE_PATH)/lib
INC_INSTALL_DIR = $(LURETTE_PATH)/include
# Where to find the cudd bdd libs
INCDIRS = $(LURETTE_PATH)/include @LIB_CUDD_PATH@
LIBDIRS = $(LURETTE_PATH)/lib @INC_CUDD_PATH@
# OCAML tools
OCAMLC = @OCAMLC@
OCAMLOPT = @OCAMLOPT@
OCAMLDEP = @OCAMLDEP@
OCAMLLIB = @OCAMLLIB@
OCAMLBEST = @OCAMLBEST@
OCAMLVERSION = @OCAMLVERSION@
CAMLIDL = @CAMLIDL@
OCAMLMAKEFILE = $(LURETTE_PATH)/OcamlMakefile
Makefile.lurette
View file @ 70fca1e8
......@@ -2,13 +2,7 @@
# Makefile for lurette based on OcamlMakefile
#
ifndef LURETTE_PATH
LURETTE_PATH := /home/jahier/lurette
endif
export LURETTE_PATH
OCAMLMAKEFILE = $(LURETTE_PATH)/OcamlMakefile
-include ../Makefile.common
OCAMLNCFLAGS = -inline 10 -noassert -unsafe
......
OcamlMakefile
View file @ 70fca1e8
......@@ -5,13 +5,15 @@
# For updates see:
# http://www.oefai.at/~markus/ocaml_sources
#
# $Id: OcamlMakefile 1.43 Mon, 07 Oct 2002 17:53:39 +0200 jahier $
# $Id: OcamlMakefile 1.44 Fri, 11 Oct 2002 17:50:55 +0200 jahier $
#
###########################################################################
# Set these variables to the names of the sources to be processed and
# the result variable. Order matters during linkage!
-include Makefile.common
SOURCES_LURETTE_LIB = \
$(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
......
README
View file @ 70fca1e8
No use of objets nor labels.
No side effect outside of env_state fields.
\ No newline at end of file
* INSTALLATION
In order to use and install it, you need somehow in your paths:
(1) An ocaml compiler (version 3.02 or higher):
http://caml.inria.fr/
(2) The CamlIDL stub code generator (version 1.04):
http://caml.inria.fr/camlidl/
(3) The BDD library CUDD (version 2.3.1)
http://vlsi.colorado.edu/~fabio/CUDD/cuddIntro.html
Then you (ougth to) just need to:
-> tar xvfz lurette-01-01-2004.tgz
-> cd lurette-01-01-2004/
-> autoconf
-> ./configure --with-cudd-lib-dir=<path to cudd lib dir> --with-cudd-include-dir=<path to cudd include dir>
-> make
* USE
The INSTALLATION step ougth to have generated in
lurette-01-01-2004/bin the following binaries:
lurette-01-01-2004/bin/lurettetop:
lurettetop is a top level loop that let one test
reactive programs written in lustre.
You can type help at the prompt for more info.
lurette-01-01-2004/bin/xlurette:
xlurette is a GUI build on top of lurettetop. It is
probably your best entry point if you want to
(automatically) test your lustre programs.
lurettetop can be useful either if xlurette is broken
or if (like me) your are not a GUI-clickodrom fan.
lurette-01-01-2004/bin/lucky:
Previous tools use a descrition a the environement
contained in a .luc files.
lurette-01-01-2004/bin/show_luc:
This program lets you vizualise .luc files offline.
In order to use those binaries, you first need
to set the environment variable LURETTE_PATH
to
\ No newline at end of file
configure.in 0 → 100644
View file @ 70fca1e8
#
# autoconf input for Objective Caml programs
# Copyright (C) 2001 Jean-Christophe Fillitre
# from a first script by Georges Mariano and then Jean-Christophe Fillitre
#
#
# the script generated by autoconf from this input will set the following
# variables:
# OCAMLC "ocamlc" if present in the path, or a failure
# or "ocamlc.opt" if present with same version number as ocamlc
# OCAMLOPT "ocamlopt" (or "ocamlopt.opt" if present), or "no"
# OCAMLBEST either "byte" if no native compiler was found,
# or "opt" otherwise
# OCAMLDEP "ocamldep"
# OCAMLLIB the path to the ocaml standard library
# OCAMLVERSION the ocaml version number
AC_INIT(Makefile.common.in)
#-----------------------------------------------------------------------------#
# Cudd
# Ask user for path to cudd stuff...
AC_ARG_WITH(cudd-include-dir,
[ --with-cudd-include-dir=<path> prefix of Cudd installation.
e.g. /usr/local/include or /usr/include],
[INC_CUDD_PATH=$with_cudd_include_dir],
AC_MSG_ERROR([You must call configure with the --with-cudd-include-dir option.
This tells configure where to find the Cudd C headers.
e.g. --with-cudd-include-dir-cudd=/usr/local/include
or --with-cudd-include-dir=/usr/include])
)
AC_ARG_WITH(cudd-lib-dir,
[ --with-cudd-lib-dir=<path> prefix of Cudd installation. e.g. /usr/local/lib or /usr/lib],
[LIB_CUDD_PATH=$with_cudd_lib_dir],
AC_MSG_ERROR([You must call configure with the --with-cudd-lib-dir option.
This tells configure where to find the Cudd C library.
e.g. --with-cudd-lib-dir=/usr/local/lib
or --with-cudd-lib-dir=/usr/lib])
)
AC_SUBST(INC_CUDD_PATH)
AC_SUBST(LIB_CUDD_PATH)
#-----------------------------------------------------------------------------#
# Lustre tools
AC_PATH_PROG(LUS2EC,lus2ec,no)
if test "$LUS2EC" = no ; then
AC_MSG_ERROR(Cannot find lus2ec the lustre to ec compiler.)
fi
AC_SUBST(LUS2EC)
AC_PATH_PROG(EC2C,ec2c,no)
if test "$EC2C" = no ; then
AC_MSG_ERROR(Cannot find ec2c the ec to c compiler.)
fi
AC_SUBST(EC2C)
AC_PATH_PROG(SIM2CHRO,sim2chro,no)
if test "$SIM2CHRO" = no ; then
AC_MSG_ERROR(Cannot find sim2chro the ec to c compiler.)
fi
AC_SUBST(SIM2CHRO)
#-----------------------------------------------------------------------------#
# Ocaml tools
# we first look for ocamlc in the path; if not present, we fail
AC_CHECK_PROG(OCAMLC,ocamlc,ocamlc,no)
if test "$OCAMLC" = no ; then
AC_MSG_ERROR(Cannot find ocamlc.)
fi
# we extract Ocaml version number and library path
OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
echo "ocaml version is $OCAMLVERSION"
OCAMLLIB=`$OCAMLC -v | tail -1 | cut -f 4 -d " "`
echo "ocaml library path is $OCAMLLIB"
# then we look for ocamlopt; if not present, we issue a warning
# if the version is not the same, we also discard it
# we set OCAMLBEST to "opt" or "byte", whether ocamlopt is available or not
AC_CHECK_PROG(OCAMLOPT,ocamlopt,ocamlopt,no)
OCAMLBEST=byte
if test "$OCAMLOPT" = no ; then
AC_MSG_WARN(Cannot find ocamlopt; bytecode compilation only.)
else
AC_MSG_CHECKING(ocamlopt version)
TMPVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
if test "$TMPVERSION" != $OCAMLVERSION ; then
AC_MSG_RESULT(differs from ocamlc; ocamlopt discarded.)
OCAMLOPT=no
else
AC_MSG_RESULT(ok)
OCAMLBEST=opt
fi
fi
# checking for ocamlc.opt
AC_CHECK_PROG(OCAMLCDOTOPT,ocamlc.opt,ocamlc.opt,no)
if test "$OCAMLCDOTOPT" != no ; then
AC_MSG_CHECKING(ocamlc.opt version)
TMPVERSION=`$OCAMLCDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
if test "$TMPVERSION" != $OCAMLVERSION ; then
AC_MSG_RESULT(differs from ocamlc; ocamlc.opt discarded.)
else
AC_MSG_RESULT(ok)
OCAMLC=$OCAMLCDOTOPT
fi
fi
# checking for ocamlopt.opt
if test "$OCAMLOPT" != no ; then
AC_CHECK_PROG(OCAMLOPTDOTOPT,ocamlopt.opt,ocamlopt.opt,no)
if test "$OCAMLOPTDOTOPT" != no ; then
AC_MSG_CHECKING(ocamlc.opt version)
TMPVER=`$OCAMLOPTDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
if test "$TMPVER" != $OCAMLVERSION ; then
AC_MSG_RESULT(differs from ocamlc; ocamlopt.opt discarded.)
else
AC_MSG_RESULT(ok)
OCAMLOPT=$OCAMLOPTDOTOPT
fi
fi
fi
# ocamldep should also be present in the path
AC_CHECK_PROG(OCAMLDEP,ocamldep,ocamldep,no)
if test "$OCAMLDEP" = no ; then
AC_MSG_ERROR(Cannot find ocamldep.)
fi
# Check for camlidl
AC_CHECK_PROG(CAMLIDL,camlidl,camlidl,no)
if test "$CAMLIDL" = no ; then
AC_MSG_ERROR(Cannot find camlidl.)
fi
#-----------------------------------------------------------------------------#
# Misc tools
AC_PATH_PROG(DOT,dot)
AC_SUBST(DOT)
AC_PATH_PROG(GV,gv)
AC_SUBST(GV)
#-----------------------------------------------------------------------------#
# substitutions to perform
AC_SUBST(OCAMLC)
AC_SUBST(OCAMLOPT)
AC_SUBST(OCAMLDEP)
AC_SUBST(OCAMLBEST)
AC_SUBST(OCAMLVERSION)
AC_SUBST(OCAMLLIB)
AC_SUBST(CAMLIDL)
#-----------------------------------------------------------------------------#
# Finally create the Makefile from Makefile.in
AC_OUTPUT(Makefile.common)
AC_OUTPUT(source/util.ml)
chmod a-w Makefile.common
chmod a-w source/util.ml
lurette.prj
View file @ 70fca1e8
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 102)
(Parent-Version lurette 0 101)
(Project-Version lurette 0 103)
(Parent-Version lurette 0 102)
(Version-Log "
Add cuddaux and mlcuddidl to the project.
Also clean-up Makefiles etc in order to make the installation
process as automatic as possible.
Add autoconf aupport.
")
(New-Version-Log ""
)
(Checkin-Time "Mon, 07 Oct 2002 17:53:39 +0200")
(Checkin-Time "Fri, 11 Oct 2002 17:50:55 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -25,7 +21,7 @@ process as automatic as possible.
;; Sources files for luc_exe
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.2 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.20 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.21 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.7 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.5 644))
......@@ -44,7 +40,7 @@ process as automatic as possible.
(source/env.mli (lurette/15_env.mli 1.16 644))
(source/env.ml (lurette/16_env.ml 1.29 644))
(source/util.ml (lurette/35_util.ml 1.27 644))
(source/util.ml (lurette/35_util.ml 1.28 444))
(source/solver.mli (lurette/38_solver.mli 1.13 644))
(source/solver.ml (lurette/39_solver.ml 1.32 644))
......@@ -56,7 +52,7 @@ process as automatic as possible.
(source/parse_env.ml (lurette/41_parse_env. 1.29 644))
(source/show_env.mli (lurette/42_show_env.m 1.8 644))
(source/show_env.ml (lurette/43_show_env.m 1.13 644))
(source/show_env.ml (lurette/43_show_env.m 1.14 644))
(source/formula.mli (lurette/44_formula.ml 1.18 644))
(source/formula.ml (lurette/45_formula.ml 1.21 644))
......@@ -79,8 +75,8 @@ process as automatic as possible.
(source/gne.mli (lurette/b/36_gne.mli 1.4 644))
(source/gne.ml (lurette/b/37_gne.ml 1.4 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.12 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.37 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.13 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.38 644))
(source/control.mli (lurette/c/3_control.ml 1.2 644))
(source/control.ml (lurette/c/4_control.ml 1.3 644))
......@@ -98,16 +94,18 @@ process as automatic as possible.
(make_lurette (lurette/27_make_luret 1.17 755))
;; Make files
(OcamlMakefile (lurette/17_OcamlMakef 1.43 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.12 644))
(user-rules (lurette/c/14_myrules 1.9 644))
(configure.in (lurette/d/11_configure. 1.1 644))
(Makefile.common.in (lurette/d/12_Makefile.c 1.1 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.44 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.13 644))
(user-rules (lurette/c/14_myrules 1.10 644))
(user-rules.skel (lurette/c/25_user-rules 1.1 644))
(source/Makefile.show_luc (lurette/b/40_Makefile.s 1.6 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.5 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.3 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.5 644))
(source/Makefile (lurette/c/20_Makefile 1.4 644))
(source/Makefile.show_luc (lurette/b/40_Makefile.s 1.7 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.6 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.4 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.6 644))
(source/Makefile (lurette/c/20_Makefile 1.5 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -118,7 +116,7 @@ process as automatic as possible.
(doc/ocamldoc.hva (lurette/b/13_ocamldoc.h 1.1 644))
;; Misc
(README (lurette/10_README 1.2 644))
(README (lurette/10_README 1.3 644))
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(lurette.dep.dot (lurette/b/4_lurette.de 1.2 644))
(lurette.depfull.dot (lurette/b/5_lurette.de 1.2 644))
......@@ -148,7 +146,7 @@ process as automatic as possible.
(test/ControleurPorte.rif.exp (lurette/b/29_Controleur 1.10 644))
(test/heater_float.rif.exp (lurette/b/30_heater_flo 1.10 644))
(test/heater_int.lus (lurette/b/43_heater_int 1.1 644))
(test/heater_float.lus (lurette/b/44_heater_flo 1.1 644))
(test/heater_float.lus (lurette/b/44_heater_flo 1.2 644))
(test/test_gen_stubs.h (lurette/b/45_test_gen_s 1.1 644))
(test/giro/allocator.lus (lurette/c/5_allocator. 1.1 644))
......@@ -160,7 +158,7 @@ process as automatic as possible.
(demo/chaudiere/buggy_chaudiere_ctrl.lus (lurette/c/10_buggy_chau 1.1 644))
(demo/chaudiere/chaudiere.luc (lurette/c/11_chaudiere. 1.5 644))
(test/Makefile (lurette/c/0_Makefile 1.5 644))
(test/Makefile (lurette/c/0_Makefile 1.6 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.6 644))
......@@ -212,6 +210,8 @@ process as automatic as possible.
(mlcuddidl/Changes (lurette/d/10_Changes 1.1 644))
)
(Merge-Parents)
(New-Merge-Parents)
source/Makefile
View file @ 70fca1e8
-include ../Makefile.common
ifndef INSTALL_DIR
INSTALL_DIR := ..
endif
......
source/Makefile.gen_stubs
View file @ 70fca1e8
#
ifndef LURETTE_PATH
LURETTE_PATH = ..
endif
-include ../Makefile.common
export LURETTE_PATH
#######################################################################
OCAMLMAKEFILE = $(LURETTE_PATH)/OcamlMakefile
SOURCES = $(LURETTE_PATH)/source/util.ml $(LURETTE_PATH)/source/gen_stubs.ml
RESULT = gen_stubs
......
source/Makefile.lucky
View file @ 70fca1e8
......@@ -2,21 +2,9 @@
# Makefile for lucky
#
ifndef LURETTE_PATH
LURETTE_PATH = ..
endif
export LURETTE_PATH
#######################################################################
# if you have cuddaux and mlcuddidl installed somewhere else, you
# should add its path there.
INCDIRS = ../include $(INC_CUDD_PATH)
LIBDIRS = ../lib $(LIB_CUDD_PATH)
-include ../Makefile.common
#######################################################################
OCAMLMAKEFILE = ../OcamlMakefile
OCAMLNCFLAGS = -inline 10
ifndef OCAMLFLAGS
......
source/Makefile.lurette_lib
View file @ 70fca1e8
......@@ -2,21 +2,10 @@
# Makefile for lurette
#
ifndef LURETTE_PATH
LURETTE_PATH = ..
endif
export LURETTE_PATH
######################################################################
# if you have cuddaux and mlcuddidl installed somewhere else, you
# should add its path there.
INCDIRS = ../include $(INC_CUDD_PATH)
LIBDIRS = ../lib $(LIB_CUDD_PATH)
-include ../Makefile.common
######################################################################
OCAMLMAKEFILE = $(LURETTE_PATH)/OcamlMakefile
OCAMLNCFLAGS = -inline 10 -noassert -unsafe
......
source/Makefile.show_luc
View file @ 70fca1e8
......@@ -2,10 +2,7 @@
# Make file for show_luc (to display env files with dot)
#
ifndef LURETTE_PATH
LURETTE_PATH = ..
endif
export LURETTE_PATH
-include ../Makefile.common
######################################################################
OCAMLMAKEFILE = $(LURETTE_PATH)/OcamlMakefile
......
source/gen_stubs.ml
View file @ 70fca1e8
<
......@@ -948,38 +948,10 @@ let compile_lustre_program_if_needed lustre_prog =
let lustre_node = Filename.basename lustre_prog in
let prog_dir = Filename.dirname lustre_prog in
let save_dir = Sys.getcwd () in
let cmd = ("lus2ec " ^ lustre_prog ^ ".lus " ^ lustre_node ^ "\n")
and cmd2 = ("ec2c " ^ lustre_prog ^ ".ec \n")
in
Sys.chdir prog_dir;
output_string stderr cmd;
if
((Sys.command cmd) <> 0)
then
(
output_string stdout
("*** lustre compilation failed. You have to generate " ^
lustre_prog ^ ".h and " ^ lustre_prog ^ ".c on your own...\n");
flush stdout;
exit 2
)
else
(
output_string stderr " ... lus2ec: ok\n";
output_string stderr cmd2;
if
((Sys.command cmd2) <> 0)
then
(
output_string stdout "*** ec2c failed. Is it in your path?\n" ;
flush stdout;
exit 2
)
else
output_string stderr " ... ec2c: ok\n";
flush stderr
);
Sys.chdir save_dir;
Util.lus2ec lustre_prog lustre_node ;
Util.ec2c lustre_prog ;
Sys.chdir save_dir
)