Commit c6d9a1c3 authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.131 Thu, 10 Apr 2003 10:03:51 +0200 by jahier

Parent-Version:      0.130
Version-Log:

Remove the need of the ocaml compilers to be able to use lurette.
The idea is to link the final executable withh the C compiler instead
of using ocamlopt.

source/lurette.ml:
source/gen_stubs.ml:
  The stubs files that are generated are ow completely different.
  The process is much more simple BTW. Now, idl files are no more
  generated dynamically. The only files that are generated are C files
  that interfaces the sut and the oracle with lurette.

/source/lurettetop.ml:
   Add the USER_TESTING_DIR env variable.

Project-Description: Lurette
parent b18b39ec
This diff is collapsed.
......@@ -22,6 +22,22 @@
# 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
INCDIRS = $(LURETTE_PATH)/$(HOST_TYPE)/lib /home/jahier/lib
LIBDIRS = $(LURETTE_PATH)/$(HOST_TYPE)/lib /home/jahier/lib
# OCAML tools
OCAMLC = ocamlc.opt
OCAMLOPT = ocamlopt.opt
OCAMLDEP = ocamldep
OCAMLLIB = /home/jahier/lib/ocaml
OCAMLBEST = opt
OCAMLVERSION = 3.06
CAMLIDL = camlidl
all: Cuddaux Mlcuddidl Lucky-and-co Xlurette
......
......@@ -2,25 +2,12 @@
#
#
# Where to install bins, libs, and include files
BIN_INSTALL_DIR = @LURETTEPATH@/$(OSTYPE)/bin
LIB_INSTALL_DIR = @LURETTEPATH@/$(OSTYPE)/lib
INC_INSTALL_DIR = @LURETTEPATH@/include
# Where to find libs
INCDIRS = @LURETTEPATH@/$(OSTYPE)/lib @MORE_INCLUDE@
LIBDIRS = @LURETTEPATH@/$(OSTYPE)/lib @MORE_LIB@
# OCAML tools
OCAMLC = @OCAMLC@
OCAMLOPT = @OCAMLOPT@
OCAMLDEP = @OCAMLDEP@
OCAMLLIB = @OCAMLLIB@
OCAMLBEST = @OCAMLBEST@
OCAMLVERSION = @OCAMLVERSION@
CAMLIDL = @CAMLIDL@
INCDIRS = @LURETTEPATH@/@HOST_TYPE@/lib @MORE_INCLUDE@
LIBDIRS = @LURETTEPATH@/@HOST_TYPE@/lib @MORE_LIB@
HOST_TYPE=@HOST_TYPE@
OCAMLMAKEFILE = @LURETTEPATH@/OcamlMakefile
LURETTE_PATH = @LURETTEPATH@
......
#
# Makefile for lurette based on OcamlMakefile
# Makefile for building the lurette executable
#
#
# SUT, ORACLE, and USER_TESTING_DIR are set up by lurettetop
#
# LURETTE_PATH ougth to be set by users
-include $(LURETTE_PATH)/Makefile.common
OCAMLNCFLAGS = -inline 10 -noassert -unsafe # -verbose
ifndef OCAMLFLAGS
OCAMLFLAGS := -noassert -unsafe -verbose
endif
INCLUDEDIRS = -I$(LURETTE_PATH)/include -I$(USER_TESTING_DIR)
LIBDIRS = -L$(LURETTE_PATH)/$(HOST_TYPE)/lib
# CC=g++
LIBS = -lgmp -lm -ldl
LIBS = str polka $(LURETTE_PATH)/$(OSTYPE)/lib/lurette_lib
SOURCES_C = ocaml2c_stubs.c $(SUT) lurette__sut.c $(ORACLE) lurette__oracle.c lurette_exe.c call_lurette_main.c
SOURCES_C = $(SUT) lurette_stub__sut.c lurette_stub__sut_idl.idl \
$(ORACLE) lurette_stub__oracle.c lurette_stub__oracle_idl.idl
bc:
$(CC) -g -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SOURCES_C) $(LIBS) -llurette_lib_bc
nc:
$(CC) -g -o lurette $(LIBDIRS) $(INCLUDEDIRS) $(SOURCES_C) $(LIBS) -llurette_lib_nc
SOURCES_OCAML = \
lurette_stub.ml lurette.mli lurette.ml
all: nc
SOURCES = $(SOURCES_C) $(SOURCES_OCAML)
RESULT = lurette
-include $(OCAMLMAKEFILE)
......@@ -5,7 +5,7 @@
# For updates see:
# http://www.oefai.at/~markus/ocaml_sources
#
# $Id: OcamlMakefile 1.47 Tue, 18 Feb 2003 09:49:47 +0100 jahier $
# $Id: OcamlMakefile 1.48 Thu, 10 Apr 2003 10:03:51 +0200 jahier $
#
###########################################################################
......@@ -26,15 +26,16 @@ SOURCES_LURETTE_LIB = \
$(LURETTE_PATH)/source/gne.mli $(LURETTE_PATH)/source/gne.ml \
$(LURETTE_PATH)/source/control.mli $(LURETTE_PATH)/source/control.ml \
$(LURETTE_PATH)/source/parse_env.mli $(LURETTE_PATH)/source/parse_env.ml \
$(LURETTE_PATH)/source/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
$(LURETTE_PATH)/source/polyhedron.mli $(LURETTE_PATH)/source/polyhedron.ml \
$(LURETTE_PATH)/source/polyhedron.mli $(LURETTE_PATH)/source/polyhedron.ml \
$(LURETTE_PATH)/source/draw.mli $(LURETTE_PATH)/source/draw.ml \
$(LURETTE_PATH)/source/store.mli $(LURETTE_PATH)/source/store.ml \
$(LURETTE_PATH)/source/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
$(LURETTE_PATH)/source/solver.mli $(LURETTE_PATH)/source/solver.ml \
$(LURETTE_PATH)/source/show_env.mli $(LURETTE_PATH)/source/show_env.ml \
$(LURETTE_PATH)/source/automata.mli $(LURETTE_PATH)/source/automata.ml \
$(LURETTE_PATH)/source/print.mli $(LURETTE_PATH)/source/print.ml \
$(LURETTE_PATH)/source/sim2chro.mli $(LURETTE_PATH)/source/sim2chro.ml \
$(LURETTE_PATH)/source/env.mli $(LURETTE_PATH)/source/env.ml
$(LURETTE_PATH)/source/env.mli $(LURETTE_PATH)/source/env.ml
ALL_SOURCES = $(SOURCES_LURETTE_LIB) $(SOURCES_OCAML)
......
......@@ -69,7 +69,7 @@ Here is what you need to do to install and use those tools.
# also, you may wish to put that statement in your .bashrc ot something
$ make install
# if you wish to install tools anywhere else than lurette-XXX/$OSTYPE/{bin,lib}
# if you wish to install tools anywhere else than lurette-XXX/os_type/{bin,lib}
-o-
......
......@@ -5,6 +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,
ca n'est guere pratique...
--> 2 options : --var-order (default), --var-name
* Mettre a jour le parseur wrt les modifs que j'ai faite a la syntax
(noeuds transiants/stationnaires + formula = ...)
......
......@@ -6,7 +6,7 @@ AC_INIT(Makefile.common.in)
if test $prefix = NONE; then
LURETTEPATH=$(pwd)
LURETTEPATH=$PWD
else
LURETTEPATH=$prefix
fi
......@@ -14,6 +14,15 @@ fi
AC_SUBST(LURETTEPATH)
# HOSTTYPE value is system dependent
case $HOSTTYPE in
*i386-linux*) HOST_TYPE=i386-linux ;;
*sun4*) HOST_TYPE=sun4 ;;
*) AC_MSG_ERROR(Unsupported architecture);;
esac
AC_SUBST(HOST_TYPE)
#-----------------------------------------------------------------------------#
# Ask user for path to more libs and headers
AC_ARG_WITH(more-include,
......@@ -32,19 +41,22 @@ AC_SUBST(MORE_LIB)
# Lustre tools
AC_CHECK_PROG(LUS2EC,lus2ec,lus2ec,no)
if test "$LUS2EC" = no ; then
AC_MSG_WARN(Cannot find lus2ec the lustre to ec compiler.)
AC_MSG_WARN(*** Cannot find lus2ec the lustre to ec compiler.)
LUS2EC=lus2ec
fi
AC_CHECK_PROG(EC2C,ec2c,ec2c,no)
if test "$EC2C" = no ; then
AC_MSG_WARN(Cannot find ec2c the ec to c compiler.)
AC_MSG_WARN(*** Cannot find ec2c the ec to c compiler.)
EC2C=ec2c
fi
AC_CHECK_PROG(SIM2CHRO,sim2chro,sim2chro,no)
if test "$SIM2CHRO" = no ; then
AC_MSG_WARN(Cannot find sim2chro.)
AC_MSG_WARN(*** Cannot find sim2chro.)
SIM2CHRO=sim2chro
fi
AC_SUBST(LUS2EC)
......@@ -52,92 +64,6 @@ AC_SUBST(EC2C)
AC_SUBST(SIM2CHRO)
#-----------------------------------------------------------------------------#
# Ocaml tools
CURRENT_OCAML_VERSION=3.06
# check for ocamlc in the path
AC_CHECK_PROG(OCAMLC,ocamlc,ocamlc)
# 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"
# ocamldep should also be present in the path
AC_PATH_PROG(OCAMLDEP,ocamldep)
# 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_PATH_PROG(OCAMLOPT,ocamlopt)
OCAMLBEST=byte
if test "$OCAMLOPT" != no ; then
# If the rigth version exists, avoid a copy...
AC_MSG_CHECKING(ocamlopt version)
TMPVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
if test "$TMPVERSION" = $CURRENT_OCAML_VERSION ; then
rm -f $LURETTEPATH/$OSTYPE/bin/ocamlopt-3.06
rm -f $LURETTEPATH/$OSTYPE/bin/ocamldep-3.06
ln -s $OCAMLOPT $LURETTEPATH/$OSTYPE/bin/ocamlopt-3.06
ln -s $OCAMLDEP $LURETTEPATH/$OSTYPE/bin/ocamldep-3.06
fi
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_PATH_PROG(OCAMLCDOTOPT,ocamlc.opt)
if test "$OCAMLCDOTOPT" != no ; then
AC_MSG_CHECKING(ocamlc.opt version)
TMPVERSION=`$OCAMLCDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
if test "$TMPVERSION" = $CURRENT_OCAML_VERSION ; then
rm -f $LURETTEPATH/$OSTYPE/bin/ocamlc-3.06
ln -s $OCAMLCDOTOPT $LURETTEPATH/$OSTYPE/bin/ocamlc-3.06
fi
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
# Check for camlidl, use the one provided in the package otherwise
AC_CHECK_PROG(CAMLIDL,camlidl,camlidl,camlidl-1.04)
if test "$CAMLIDL" = camlidl-1.04 ; then
AC_MSG_WARN(Cannot find camlidl. I will use camlidl-1.04 instead.)
else
rm -f $LURETTEPATH/$OSTYPE/bin/camlidl-1.04
rm -f $LURETTEPATH/$OSTYPE/lib/libcamlidl.a
fi
#-----------------------------------------------------------------------------#
# Misc tools
AC_CHECK_PROG(DOT,dot,dot,no)
......@@ -152,26 +78,26 @@ if test "$GV" = no ; then
fi
#-----------------------------------------------------------------------------#
# substitutions to perform
OCAMLOPT=ocamlopt-$CURRENT_OCAML_VERSION
OCAMLC=ocamlc-$CURRENT_OCAML_VERSION
OCAMLDEP=ocamldep-$CURRENT_OCAML_VERSION
AC_SUBST(OCAMLC)
AC_SUBST(OCAMLOPT)
AC_SUBST(OCAMLDEP)
AC_SUBST(OCAMLBEST)
AC_SUBST(OCAMLVERSION)
AC_SUBST(OCAMLLIB)
AC_SUBST(CAMLIDL)
#-----------------------------------------------------------------------------#
AC_OUTPUT(Makefile.common lucky_init.sh lucky_init.csh)
chmod a-w Makefile.common
echo " Do not forget to do a "
echo " source lucky_init.sh "
echo " or"
echo " source lucky_init.csh"
echo " (if you are using csh) "
echo " 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)."
echo
echo " if you want to install tools anywhere else than lurette-XXX/$HOSTTYPE/{bin,lib}"
echo " you can type "
echo " ./configure --prefix=<where to install bins and libs>"
echo " and then do a "
echo " make install"
echo
echo " bye!"
......@@ -2,9 +2,13 @@
# Set up environment variables needed by lucky, lurettetop, and xlurette
# (csh syntax)
echo "sourcing the content of lucky_init.csh..."
setenv LURETTE_PATH @LURETTEPATH@
set path=(@LURETTEPATH@/@HOST_TYPE@/bin $path)
setenv PS_VIEWER @GV@
setenv DOT @DOT@
setenv LUS2EC @LUS2EC@
setenv EC2C @EC2C@
setenv SIM2CHRO @SIM2CHRO@
setenv HOSY_TYPE @HOST_TYPE@
......@@ -2,9 +2,13 @@
# Set up environment variables needed by lucky, lurettetop, and xlurette
# (sh syntax)
echo "sourcing the content of lucky_init.sh..."
export LURETTE_PATH=@LURETTEPATH@
export path=@LURETTEPATH@/@HOST_TYPE@/bin $path
export PS_VIEWER=@GV@
export DOT=@DOT@
export LUS2EC=@LUS2EC@
export EC2C=@EC2C@
export SIM2CHRO=@SIM2CHRO@
export HOST_TYPE=@HOST_TYPE@
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 130)
(Parent-Version lurette 0 129)
(Version-Log "")
(Project-Version lurette 0 131)
(Parent-Version lurette 0 130)
(Version-Log "
Remove the need of the ocaml compilers to be able to use lurette.
The idea is to link the final executable withh the C compiler instead
of using ocamlopt.
source/lurette.ml:
source/gen_stubs.ml:
The stubs files that are generated are ow completely different.
The process is much more simple BTW. Now, idl files are no more
generated dynamically. The only files that are generated are C files
that interfaces the sut and the oracle with lurette.
/source/lurettetop.ml:
Add the USER_TESTING_DIR env variable.
")
(New-Version-Log ""
)
(Checkin-Time "Fri, 07 Mar 2003 10:37:48 +0100")
(Checkin-Time "Thu, 10 Apr 2003 10:03:51 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -18,14 +34,14 @@
;; 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.28 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.29 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.12 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.9 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.12 644))
(source/lurette.ml (lurette/12_lurette.ml 1.63 644))
(source/lurette.mli (lurette/11_lurette.ml 1.13 644))
(source/lurette.ml (lurette/12_lurette.ml 1.64 644))
(source/command_line.ml (lurette/b/20_command_li 1.12 644))
(source/command_line.mli (lurette/b/21_command_li 1.11 644))
......@@ -37,12 +53,12 @@
(source/env.mli (lurette/15_env.mli 1.17 644))
(source/env.ml (lurette/16_env.ml 1.29 644))
(source/util.ml (lurette/35_util.ml 1.42 644))
(source/util.ml (lurette/35_util.ml 1.43 644))
(source/solver.mli (lurette/38_solver.mli 1.14 644))
(source/solver.ml (lurette/39_solver.ml 1.45 644))
(source/solver.ml (lurette/39_solver.ml 1.46 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.4 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.5 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.1 644))
(source/store.mli (lurette/b/26_rnumsolver 1.16 644))
......@@ -52,7 +68,7 @@
(source/pnumsolver.mli (lurette/d/24_pnumsolver 1.2 644))
(source/parse_env.mli (lurette/40_parse_env. 1.13 644))
(source/parse_env.ml (lurette/41_parse_env. 1.40 644))
(source/parse_env.ml (lurette/41_parse_env. 1.41 644))
(source/show_env.mli (lurette/42_show_env.m 1.8 644))
(source/show_env.ml (lurette/43_show_env.m 1.16 644))
......@@ -78,8 +94,8 @@
(source/gne.mli (lurette/b/36_gne.mli 1.5 644))
(source/gne.ml (lurette/b/37_gne.ml 1.5 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.28 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.42 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.29 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.43 644))
(source/control.mli (lurette/c/3_control.ml 1.3 644))
(source/control.ml (lurette/c/4_control.ml 1.4 644))
......@@ -90,35 +106,40 @@
(source/ne.ml (lurette/c/21_ne.ml 1.6 644))
(source/ne.mli (lurette/c/22_ne.mli 1.5 644))
(source/value.ml (lurette/c/23_value.ml 1.3 644))
(source/value.mli (lurette/c/24_value.mli 1.1 644))
(source/value.ml (lurette/c/23_value.ml 1.4 644))
(source/value.mli (lurette/c/24_value.mli 1.2 644))
(source/prevar.ml (lurette/d/18_prevar.ml 1.1 644))
(source/prevar.mli (lurette/d/19_prevar.mli 1.1 644))
(source/prevar.ml (lurette/d/18_prevar.ml 1.2 644))
(source/prevar.mli (lurette/d/19_prevar.mli 1.2 644))
(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/show_luc.ml (lurette/e/25_show_luc.m 1.1 644))
(source/ocaml2c.idl (lurette/e/26_ocaml2c.id 1.1 644))
(source/lurette_exe.c (lurette/e/27_lurette_ex 1.1 644))
; little script that sets env vars and starts the lurette build
(make_lurette (lurette/27_make_luret 1.17 755))
;; Make files
(configure.in (lurette/d/11_configure. 1.2 644))
(Makefile.common.in (lurette/d/12_Makefile.c 1.3 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.47 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.17 644))
(user-rules (lurette/c/14_myrules 1.28 644))
(user-rules.skel (lurette/c/25_user-rules 1.3 644))
(Makefile (lurette/d/13_Makefile 1.1 644))
(configure.in (lurette/d/11_configure. 1.3 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.18 644))
(user-rules (lurette/c/14_myrules 1.29 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.15 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.16 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.5 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.16 644))
(source/Makefile (lurette/c/20_Makefile 1.10 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.17 644))
(source/Makefile (lurette/c/20_Makefile 1.11 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -129,21 +150,25 @@
(doc/ocamldoc.hva (lurette/b/13_ocamldoc.h 1.1 644))
;; Misc
(README (lurette/10_README 1.6 644))
(README (lurette/10_README 1.7 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))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.10 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.35 644))
(test/time-ossau.res (lurette/b/49_time.res 1.38 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.12 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.12 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.36 644))
(test/time-ossau.res (lurette/b/49_time.res 1.39 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.13 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.13 644))
;; Various files used for testing purposes
(test/usager.luc (lurette/b/14_usager.env 1.11 644))
(test/tram.luc (lurette/b/15_tram.env 1.10 644))
(test/porte.luc (lurette/b/16_porte.env 1.9 644))
(test/porte.luc (lurette/b/16_porte.env 1.10 644))
(test/passerelle.luc (lurette/b/17_passerelle 1.10 644))
(test/temp_int.luc (lurette/b/50_temp_int.e 1.5 644))
(test/temp_float.luc (lurette/b/51_temp_float 1.6 644))
......@@ -158,7 +183,7 @@
(test/tram_simple.h (lurette/b/25_tram_simpl 1.1 644))
(test/heater_int.rif.exp (lurette/b/28_heater_int 1.11 644))
(test/ControleurPorte.rif.exp (lurette/b/29_Controleur 1.12 644))
(test/ControleurPorte.rif.exp (lurette/b/29_Controleur 1.13 644))
(test/heater_float.rif.exp (lurette/b/30_heater_flo 1.13 644))
(test/heater_int.lus (lurette/b/43_heater_int 1.1 644))
(test/heater_float.lus (lurette/b/44_heater_flo 1.2 644))
......@@ -176,7 +201,7 @@
(test/losange.luc (lurette/d/27_losange.lu 1.2 644))
(test/losange-3d.luc (lurette/d/28_losange-3d 1.2 644))
(test/Makefile (lurette/c/0_Makefile 1.9 644))
(test/Makefile (lurette/c/0_Makefile 1.10 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.16 644))
......@@ -276,12 +301,6 @@
(polka/Changes (lurette/e/22_Changes 1.1 644))
(TODO (lurette/d/22_TODO 1.9 644))
(lucky_init.csh.in (lurette/e/23_lucky_init 1.1 644))
(lucky_init.sh.in (lurette/e/24_lucky_init 1.1 644))
)
(Merge-Parents)
(New-Merge-Parents)
......@@ -6,14 +6,63 @@ ifndef INSTALL_DIR
endif
lib:
make -f Makefile.lurette_lib OCAMLFLAGS="-noassert -unsafe"
lib_debug:
make dcl -f Makefile.lurette_lib OCAMLFLAGS=""
lib_gprof:
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 r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libcuddaux.a ;\
ar r liblurette_lib_nc.a ../lurette_lib.o *.o ; rm *.o ;\
ar x /home/jahier/lib/libcudd.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libpolkag_caml.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libpolkag.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libcamlidl.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libmtr.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libst.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libepd.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libutil.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libstr.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/lurette/i386-linux/lib/libasmrun.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
cp liblurette_lib_nc.a ..
libnc: liblurette_lib_nc.a
make nc -f Makefile.lurette_lib OCAMLFLAGS="-noassert -unsafe"
ar r liblurette_lib_nc.a lurette_lib.o
libbc:liblurette_lib_bc.a
make bc -f Makefile.lurette_lib OCAMLFLAGS=""
cp libcamlrun-$(HOST_TYPE).a liblurette_lib_bc.a
ar r liblurette_lib_bc.a lurette_lib.o
libdc:liblurette_lib_dc.a
make dc -f Makefile.lurette_lib OCAMLFLAGS=""
cp libcamlrun-$(HOST_TYPE).a liblurette_lib_dc.a
ar r liblurette_lib_dc.a lurette_lib.o
lib_gprof:liblurette_lib_gprof.a
make pncl -f Makefile.lurette_lib OCAMLFLAGS=""
lib_prof:
cp libcamlrun-$(HOST_TYPE).a liblurette_lib_gprof.a
ar r liblurette_lib_gprof.a lurette_lib.o
lib_prof:liblurette_lib_prof.a
make pbcl -f Makefile.lurette_lib OCAMLFLAGS=""
cp libcamlrun-$(HOST_TYPE).a liblurette_lib_prof.a
ar r liblurette_lib_prof.a lurette_lib.o
......@@ -45,7 +94,7 @@ gen_lut:
make -k nc -f Makefile.gen_fake_lutin OCAMLFLAGS="-noassert -unsafe"
all: lib lucky ltop show stubs gen_lut
all: libnc lucky ltop show stubs gen_lut
clean_exe:
......@@ -67,6 +116,7 @@ cp:
cp lurettetop $(BIN_INSTALL_DIR) ; \
cp *.cmi $(LIB_INSTALL_DIR) ;\
cp *.cmx $(LIB_INSTALL_DIR) ;\
cp lurette_lib.*a $(LIB_INSTALL_DIR)
cp liblurette_lib_nc.a $(LIB_INSTALL_DIR) ;\
cp ocaml2c.h $(INC_INSTALL_DIR)
install: all cp
......@@ -26,6 +26,7 @@ STATIC = yes
SOURCES_OCAML = \
$(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/stubs_idl.ml \
$(LURETTE_PATH)/source/graph.mli \