Commit abd625df authored by erwan's avatar erwan

Update: use dune instead of oasis

Remove a lot of warnings (considered as errors by dune).

Split the lutin opam package into several ones:
- lutin
- ezdl
- gbddml

Also, I've merge the content of lutin-utils into lutin.

Note that this opam "package split/ocaml library merge" move is
somewhat imposed by the fact that dune impose the use of one opam
package per library (if I got it correctly). But as a matter of fact,
merging lutin and lutin-utils libs makes sense. Having standalone ezdl
and gbddml opam packages too.
parent fd3acf61
Pipeline #28471 passed with stages
in 3 minutes and 52 seconds
......@@ -35,7 +35,6 @@ src/lexer.mli
*.tgz
xx
xxx
bin
#*
*.output
*.lnk
......@@ -123,7 +122,6 @@ old
obsolete
win32
mac
lib
include
pre_release
working
......@@ -281,4 +279,16 @@ archive
my-rdbg-tuning.ml
rdbg-session.ml
README.md
INSTALL.txt
\ No newline at end of file
INSTALL.txt
.merlin
*.install
lib/lutin/lutinUtils.ml
lib/lutin/lutinUtils.mli
lib/lutin/version.ml
lib/polka/matrix.ml
lib/polka/matrix.mli
lib/polka/poly.ml
lib/polka/poly.mli
lib/polka/sedscript
lib/polka/vector.ml
lib/polka/vector.mli
image: ocaml/opam:ubuntu
image: ocaml/opam2:ubuntu
variables:
GIT_STRATEGY: clone
......@@ -11,28 +11,30 @@ stages:
build:
stage: build
script:
- sudo apt-get install -y m4
- opam repo add opam-ocaml-org "https://opam.ocaml.org"
- opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test/opam-repository"
- opam update
- opam depext -y oasis camlidl mlgmpidl rdbg lustre-v6
- opam install -y oasis camlidl mlgmpidl
- opam install rdbg lustre-v6
- opam depext -y dune mlgmpidl lustre-v6
- opam install dune mlgmpidl camlidl lustre-v6
- make
- make install
test_opam_test:
stage: test
script:
- sudo apt-get install -y m4
- opam repo add opam-ocaml-org "https://opam.ocaml.org"
- opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test/opam-repository"
- opam update
- opam depext -y mlgmpidl lutin
- opam depext -y lutin
- opam install -y lutin
allow_failure: true
# may fail if an ADT changes in lutils or rdbg-plugin, since this repo
# can only be updated if the whole pipeline succeeds (to be able te get
# the release number). The idea is to rerun this job manually when it
# is the case.
# may fail if an ADT changes in lutils or rdbg, since this repo can
# only be updated if the whole pipeline succeeds (to be able te get
# the release number). The idea is to rerun this job manually once the
# opam package has beeb updates when it is the case.
release:
before_script:
......
......@@ -5,50 +5,38 @@ all:build
-include ./Makefile.local
###################################################
# Some more clutches because oasis does not support camlidl
polka/vector.ml: polka/vector.idl
cd polka; make idl
# Some clutches because dune does not support camlidl
lib/polka/vector.ml: lib/polka/vector.idl
cd lib/polka; make idl
lutin-utils/src/lutinUtils.ml: lutin-utils/src/lutinUtils.idl
cd lutin-utils/src/; make
lib/lutin/lutinUtils.ml: lib/lutin/lutinUtils.idl
cd lib/lutin/; make
###################################################
build: setup.data lutin/src/version.ml
ocaml setup.ml -build
setup.ml:_oasis lutin/src/version.ml polka/vector.ml lutin-utils/src/lutinUtils.ml
oasis setup
PREFIX=$(shell opam config var prefix)
setup.data:configure
configure: setup.ml
ocaml setup.ml -configure --prefix $(PREFIX)
.PHONY:doc
doc:
ocaml setup.ml -doc
build: lib/lutin/version.ml lib/lutin/lutinUtils.ml lib/polka/vector.ml
dune build @install
man:
cd doc/lutin-man/ && make || echo "cannot build the doc";exit 0
install:
ocaml setup.ml -install
cp lutin/src/lut4c_stubs.h $(PREFIX)/lib/lutin/
dune install
uninstall:
ocaml setup.ml -uninstall
dune uninstall
reinstall:
ocaml setup.ml -reinstall
distclean:
ocaml setup.ml -distclean
rm -rf _build/src
dune reinstall
clean:
dune clean
cd lib/polka; make clean
cd lib/lutin; make clean
rm lib/lutin/version.ml
.PHONY: test slink
test: slink cpcomp
test: # cpcomp
cd examples && make test
......
......@@ -79,9 +79,5 @@ oi:install
or:reinstall
ob:build
oc:clean
clean:
ocaml setup.ml -clean
rm -f setup.data
cd polka; make clean
cd lutin-utils/src/ ; make clean
cleanall: clean
cd examples/; make clean
......@@ -6,9 +6,9 @@ BRANCH:=$(shell git branch | grep "*" | cut -d ' ' -f 2 || echo "opam")
VERSION=$(shell git describe --tags || basename `pwd` | cut -d '.' -f2-4)
lutin/src/version.ml:
echo "let str=\"$(VERSION)\"" > lutin/src/version.ml ; \
echo "let sha=\"$(SHA)\"" >> lutin/src/version.ml ; \
lib/lutin/version.ml:
echo "let str=\"$(VERSION)\"" > lib/lutin/version.ml ; \
echo "let sha=\"$(SHA)\"" >> lib/lutin/version.ml ; \
echo "\\\newcommand{\\\version}{$(VERSION)}" > doc/version.tex ; \
echo "\\\newcommand{\\\sha}{$(SHA)}" >> doc/version.tex ; \
echo "\\\newcommand{\\\versionname}{Trilby}" >> doc/version.tex ; \
......
OASISFormat: 0.4
Name: lutin
Version: 2.70.4
Authors: Erwan Jahier, Pascal Raymond, Bertrand Jeannnet (polka), Yvan Roux
Maintainers: erwan.jahier@univ-grenoble-alpes.fr
License: CeCILL
Plugins: DevFiles (0.4), META (0.4), StdFiles (0.4)
Synopsis: Lutin: modeling stochastic reactive systems.
Homepage: http://www-verimag.imag.fr/Lutin.html
OCamlVersion: >= 4.02
Description:
Lutin is a language to model stochastic reactive systems.
It has been initially designed to model environments and perform
automated testing of reactive systems with Lurette.
BuildTools: ocamlbuild
PreBuildCommand: make lutin/src/version.ml
SourceRepository "master"
Type: git
Location: https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutin.git
Browser: https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutin
#PreBuildCommand: make gen_version
Executable lutin
Path: lutin/src
MainIs: main.ml
BuildDepends: str,unix,num,rdbg,lutin-utils,ezdl,gbddml,polka,camlidl,gmp
NativeOpt: -w A -package num # XXX turn around a bug in oasis/ocamlbuild/ocamlfind?
Build: true
Install:true
CompiledObject: native
CClib: -lcamlidl
Executable "lutin.dbg"
Path: lutin/src
MainIs: main.ml
BuildDepends: str,unix,num,rdbg,lutin-utils,ezdl,gbddml,polka,camlidl,gmp
NativeOpt: -w A -package num # XXX turn around a bug in oasis/ocamlbuild/ocamlfind?
Build: true
Install:false
CompiledObject: byte
CClib: -lcamlidl
# to use ocamldebug:
# - here: set CompiledObject from native to byte
# - from emacs: [M-x ocamldebug] ~/lus2lic/_build/src/main.byte
# - from ocamldebug prompt:
# cd test
# set arg blabla
# dir ~/lurette/lutin/src ~/lurette/_build/src ~/rdbg/src ~/rdbg/_build/src ~/lutils/src ~/lutils/_build/src
Library lutin
XMETADescription: Provides an API to call Lutin from ocaml (and rdbg)
Path: lutin/src
Modules: LutinRun
BuildDepends: lutin-utils,ezdl,gbddml,bigarray,polka,camlidl,lutils
Install:true
CompiledObject: native
XMETAEnable: true
InternalModules: Auto2Lucky,AutoGen,Bddd,CheckEnv,CheckType,CkIdentInfo,CkTypeEff,CoAlgExp,CoIdent,CoTraceExp,Constraint,Draw,Exp,ExpEval,Expand,ExprUtil,FGen,Formula_to_bdd,GenOcamlGlue,Glue,Gne,Guard,Lexeme,LoopWeights,Luc2alice,Luc2c,LucFGen,Lucky,LutErrors,LutExe,LutLexer,LutParser,LutPredef,LutProg,Version,MainArg,Ne,Parsers,Poly_draw,Polyhedron,Prevar,Prog,Reactive,Rif,Sol_nb,Solver,Store,Syntaxe,SyntaxeDump,Thickness,Type,Util,Utils,Value,Var,Verbose
DllLib: libgmp.so dllcamlidl.so
Library bddrand
XMETADescription: A simple front-end to the lutin Random toss machinary
Path: lutin/src
Modules: BddRandom,Dimacs
BuildDepends: lutin-utils,ezdl,gbddml,bigarray,polka,camlidl,lutils
FindlibParent: lutin
Install:true
CompiledObject: native
XMETAEnable: true
DllLib: libgmp.so dllcamlidl.so
#Library lut4c
# XMETADescription: Calling Lutin from C XXX NOT WORKING
# Path: lutin/src
# Modules: Lut4c
# FindlibParent: lutin
# BuildDepends: str,unix,num,rdbg,lutin-utils,ezdl,gbddml,polka
# Install: true
# CSources: lut4c_stubs.h,lut4c_stubs.c
# CCOpt: -fPIC
Library "lutin-utils"
XMETADescription: Some C functions used by the lutin runtime
Path: lutin-utils/src
Modules: LutinUtils
Install: true
CSources: lutinUtils.h,lutinUtils_c.c,lutinUtils_stubs.c,myuid.h,myuid.c
CCOpt: -fPIC -I$pkg_camlidl -I/usr/local/include/
# mimick the behavior of 'rdbg -lurette', but without the dependency on ocaml
# The drawback is that the lutin and lustre lib are statically part of it
Executable lurette
Path: lurette-nocaml/src
MainIs: lurette.ml
BuildDepends: str,num,dynlink,extlib,lutils (>= 1.9),lutin-utils,ezdl,gbddml,polka,camlidl,gmp,rdbg,lustre-v6,lutin
Install:true
CompiledObject: native
CClib: -lcamlidl
# should be moved to lutils
Library ezdl
XMETADescription: ezdl: easy dynamic linking of C functions from ocaml
Path: EZDL
Modules: Ezdl
Install: true
CSources: Ezdl_c.c,Inspect_c.c
CCOpt: -fPIC
# should be moved to lutils
Library gbddml
XMETADescription: gbddml: the Verimag bdd library
Path: gbddml
Modules: Bdd
Install: true
CSources: gbdd_cml.c, gbdd.c, gbdd.h
CCOpt: -x c++ -g -O2 -fno-operator-names -fPIC -I$pkg_camlidl
CClib: -lstdc++
Library polka
XMETADescription: polka: convex polyhedron library by Bertrand Jeannet (now part of apron)
Path: polka
Modules: Polka,PolkaIO,Vector,Matrix,Poly,Polka_parser,Polka_lexer
BuildDepends: num,gmp # actually it is named mlgmpidl in opam
Install: true
CSources: pkint.h, config.h,
polka.h, internal.h, bit.h, satmat.h, cherni.h,
vector.h, matrix.h, poly.h, polka_caml.h,
polka_c.c, internal.c, bit.c, satmat.c, cherni.c,
vector_c.c, matrix_c.c, poly_c.c,
vector_caml.c, matrix_caml.c, poly_caml.c, polka_caml.c
CCOpt: -O3 -fPIC -DPOLKA_NUM=3 -I$pkg_camlidl -I/usr/local/include/
DllLib: libgmp.so dllcamlidl.so
# XXX not working
Document "lutin-man.pdf"
Title: Lutin language reference manual
Type: custom (0.4)
DataFiles: doc/lutin-man/lutin-man.pdf
XCustom: make
InstallDir: $docdir
Build: true
Install: true
BuildTools: make
XOCamlbuildPath: doc/lutin-man
# OASIS_START
# DO NOT EDIT (digest: 49eff0d7ab0fb991e05d54ceacda33a1)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
true: annot, bin_annot
<**/.svn>: -traverse
<**/.svn>: not_hygienic
".bzr": -traverse
".bzr": not_hygienic
".hg": -traverse
".hg": not_hygienic
".git": -traverse
".git": not_hygienic
"_darcs": -traverse
"_darcs": not_hygienic
# Library lutin-utils
"lutin-utils/src/lutin-utils.cmxs": use_lutin-utils
<lutin-utils/src/*.ml{,i,y}>: oasis_library_lutin_utils_ccopt
"lutin-utils/src/lutinUtils_c.c": oasis_library_lutin_utils_ccopt
"lutin-utils/src/lutinUtils_stubs.c": oasis_library_lutin_utils_ccopt
"lutin-utils/src/myuid.c": oasis_library_lutin_utils_ccopt
<lutin-utils/src/lutin-utils.{cma,cmxa}>: use_liblutin-utils_stubs
# Library ezdl
"EZDL/ezdl.cmxs": use_ezdl
<EZDL/*.ml{,i,y}>: oasis_library_ezdl_ccopt
"EZDL/Ezdl_c.c": oasis_library_ezdl_ccopt
"EZDL/Inspect_c.c": oasis_library_ezdl_ccopt
<EZDL/ezdl.{cma,cmxa}>: use_libezdl_stubs
# Library gbddml
"gbddml/gbddml.cmxs": use_gbddml
<gbddml/*.ml{,i,y}>: oasis_library_gbddml_ccopt
"gbddml/gbdd_cml.c": oasis_library_gbddml_ccopt
"gbddml/gbdd.c": oasis_library_gbddml_ccopt
<gbddml/gbddml.{cma,cmxa}>: oasis_library_gbddml_cclib
"gbddml/libgbddml_stubs.lib": oasis_library_gbddml_cclib
"gbddml/dllgbddml_stubs.dll": oasis_library_gbddml_cclib
"gbddml/libgbddml_stubs.a": oasis_library_gbddml_cclib
"gbddml/dllgbddml_stubs.so": oasis_library_gbddml_cclib
<gbddml/gbddml.{cma,cmxa}>: use_libgbddml_stubs
# Library polka
"polka/polka.cmxs": use_polka
<polka/*.ml{,i,y}>: oasis_library_polka_ccopt
"polka/polka_c.c": oasis_library_polka_ccopt
"polka/internal.c": oasis_library_polka_ccopt
"polka/bit.c": oasis_library_polka_ccopt
"polka/satmat.c": oasis_library_polka_ccopt
"polka/cherni.c": oasis_library_polka_ccopt
"polka/vector_c.c": oasis_library_polka_ccopt
"polka/matrix_c.c": oasis_library_polka_ccopt
"polka/poly_c.c": oasis_library_polka_ccopt
"polka/vector_caml.c": oasis_library_polka_ccopt
"polka/matrix_caml.c": oasis_library_polka_ccopt
"polka/poly_caml.c": oasis_library_polka_ccopt
"polka/polka_caml.c": oasis_library_polka_ccopt
<polka/polka.{cma,cmxa}>: oasis_library_polka_dlllib
<polka/polka.{cma,cmxa}>: use_libpolka_stubs
<polka/*.ml{,i,y}>: package(gmp)
<polka/*.ml{,i,y}>: package(num)
"polka/polka_c.c": package(gmp)
"polka/polka_c.c": package(num)
"polka/internal.c": package(gmp)
"polka/internal.c": package(num)
"polka/bit.c": package(gmp)
"polka/bit.c": package(num)
"polka/satmat.c": package(gmp)
"polka/satmat.c": package(num)
"polka/cherni.c": package(gmp)
"polka/cherni.c": package(num)
"polka/vector_c.c": package(gmp)
"polka/vector_c.c": package(num)
"polka/matrix_c.c": package(gmp)
"polka/matrix_c.c": package(num)
"polka/poly_c.c": package(gmp)
"polka/poly_c.c": package(num)
"polka/vector_caml.c": package(gmp)
"polka/vector_caml.c": package(num)
"polka/matrix_caml.c": package(gmp)
"polka/matrix_caml.c": package(num)
"polka/poly_caml.c": package(gmp)
"polka/poly_caml.c": package(num)
"polka/polka_caml.c": package(gmp)
"polka/polka_caml.c": package(num)
# Library bddrand
"lutin/src/bddrand.cmxs": use_bddrand
"lutin/src/bddrand.cmxa": oasis_library_bddrand_dlllib
# Library lutin
"lutin/src/lutin.cmxs": use_lutin
"lutin/src/lutin.cmxa": oasis_library_lutin_dlllib
<lutin/src/*.ml{,i,y}>: package(bigarray)
<lutin/src/*.ml{,i,y}>: package(lutils)
# Executable lurette
"lurette-nocaml/src/lurette.native": oasis_executable_lurette_cclib
"lurette-nocaml/src/lurette.native": package(bigarray)
"lurette-nocaml/src/lurette.native": package(camlidl)
"lurette-nocaml/src/lurette.native": package(dynlink)
"lurette-nocaml/src/lurette.native": package(extlib)
"lurette-nocaml/src/lurette.native": package(gmp)
"lurette-nocaml/src/lurette.native": package(lustre-v6)
"lurette-nocaml/src/lurette.native": package(lutils)
"lurette-nocaml/src/lurette.native": package(num)
"lurette-nocaml/src/lurette.native": package(rdbg)
"lurette-nocaml/src/lurette.native": package(str)
"lurette-nocaml/src/lurette.native": use_ezdl
"lurette-nocaml/src/lurette.native": use_gbddml
"lurette-nocaml/src/lurette.native": use_lutin
"lurette-nocaml/src/lurette.native": use_lutin-utils
"lurette-nocaml/src/lurette.native": use_polka
<lurette-nocaml/src/*.ml{,i,y}>: package(bigarray)
<lurette-nocaml/src/*.ml{,i,y}>: package(camlidl)
<lurette-nocaml/src/*.ml{,i,y}>: package(dynlink)
<lurette-nocaml/src/*.ml{,i,y}>: package(extlib)
<lurette-nocaml/src/*.ml{,i,y}>: package(gmp)
<lurette-nocaml/src/*.ml{,i,y}>: package(lustre-v6)
<lurette-nocaml/src/*.ml{,i,y}>: package(lutils)
<lurette-nocaml/src/*.ml{,i,y}>: package(num)
<lurette-nocaml/src/*.ml{,i,y}>: package(rdbg)
<lurette-nocaml/src/*.ml{,i,y}>: package(str)
<lurette-nocaml/src/*.ml{,i,y}>: use_ezdl
<lurette-nocaml/src/*.ml{,i,y}>: use_gbddml
<lurette-nocaml/src/*.ml{,i,y}>: use_lutin
<lurette-nocaml/src/*.ml{,i,y}>: use_lutin-utils
<lurette-nocaml/src/*.ml{,i,y}>: use_polka
# Executable lutin.dbg
"lutin/src/main.byte": oasis_executable_lutin_dbg_cclib
"lutin/src/main.byte": oasis_executable_lutin_dbg_native
<lutin/src/*.ml{,i,y}>: oasis_executable_lutin_dbg_native
"lutin/src/main.byte": package(camlidl)
"lutin/src/main.byte": package(gmp)
"lutin/src/main.byte": package(num)
"lutin/src/main.byte": package(rdbg)
"lutin/src/main.byte": package(str)
"lutin/src/main.byte": package(unix)
"lutin/src/main.byte": use_ezdl
"lutin/src/main.byte": use_gbddml
"lutin/src/main.byte": use_lutin-utils
"lutin/src/main.byte": use_polka
# Executable lutin
"lutin/src/main.native": oasis_executable_lutin_cclib
"lutin/src/main.native": oasis_executable_lutin_native
<lutin/src/*.ml{,i,y}>: oasis_executable_lutin_native
"lutin/src/main.native": package(camlidl)
"lutin/src/main.native": package(gmp)
"lutin/src/main.native": package(num)
"lutin/src/main.native": package(rdbg)
"lutin/src/main.native": package(str)
"lutin/src/main.native": package(unix)
"lutin/src/main.native": use_ezdl
"lutin/src/main.native": use_gbddml
"lutin/src/main.native": use_lutin-utils
"lutin/src/main.native": use_polka
<lutin/src/*.ml{,i,y}>: package(camlidl)
<lutin/src/*.ml{,i,y}>: package(gmp)
<lutin/src/*.ml{,i,y}>: package(num)
<lutin/src/*.ml{,i,y}>: package(rdbg)
<lutin/src/*.ml{,i,y}>: package(str)
<lutin/src/*.ml{,i,y}>: package(unix)
<lutin/src/*.ml{,i,y}>: use_ezdl
<lutin/src/*.ml{,i,y}>: use_gbddml
<lutin/src/*.ml{,i,y}>: use_lutin-utils
<lutin/src/*.ml{,i,y}>: use_polka
# OASIS_STOP
#"lutin/src/lut4c.ml": output_obj
# "src/lutin.cmxa": linkall
opam-version: "2.0"
synopsis: "A simple front-end to the lutin Random toss machinary"
description: "A simple front-end to the lutin Random toss machinary"
maintainer: "erwan.jahier@univ-grenoble-alpes.fr"
license: "CeCILL"
homepage: "http://www-verimag.imag.fr/"
bug-reports: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutin"
depends: [
"ocaml" {>= "4.05"}
"base-unix" {build}
"dune" {build & >= "1.11"}
"lutin"
]
build: [
[make "build"]
]
install: [make "install"]
post-messages:
"The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/"
(executable
(name lurette)
(libraries lustre-v6 lutin)
)
(install
(section bin)
(package lutin)
(files (lurette.exe as lurette))
)
(* Time-stamp: <modified the 02/08/2019 (at 14:38) by Erwan Jahier> *)
(* Time-stamp: <modified the 30/08/2019 (at 14:54) by Erwan Jahier> *)
(* Mimick the behavior of 'rdbg -lurette', but without the dependency
on ocaml *)
open Event
open RdbgWrapperArgs
......
(executable
(name main)
(libraries lutin ezdl gbddml camlidl)
)
(install
(section bin)
(package lutin)
(files (main.exe as lutin))
)
(*pp camlp4o pa_macro.cmo -USTAT *)
(** LUTIN2 : programme principal *)
open Lexeme
open Filename
open MainArg
open LutErrors
......@@ -11,7 +9,7 @@ exception Stop
(* selection du fichier de sortie *)
let outchannel nodename opt = (
if (MainArg.outpipe opt) then (
Pervasives.stdout
Stdlib.stdout
) else (
let outname = (
match MainArg.outfile opt with
......@@ -24,7 +22,7 @@ let outchannel nodename opt = (
)
) in
Verbose.put "#OUTFILE: %s\n" outname;
Pervasives.open_out outname
Stdlib.open_out outname
)
)
......@@ -159,7 +157,7 @@ and main_loop oc opt t init_state init_pre_lut_output state pre_lut_output = (
with RifIO.Reset ->
main_loop_core oc opt t init_state init_pre_lut_output init_state init_pre_lut_output
)
and main_loop_core oc opt t init_state init_pre_lut_output state pre_lut_output = (
and main_loop_core oc opt t init_state init_pre_lut_output state _pre_lut_output = (
let step_str =
("#step " ^ (string_of_int t)) ^
(if state.Prog.d.Prog.verbose >= 1
......@@ -273,12 +271,12 @@ let to_exe oc infile mnode opt = (
Rif.flush oc;
exit 2
)
| exe, LutExe.SomeBehavior (b, bg') -> (
| exe, LutExe.SomeBehavior (b, _bg') -> (
match b with
| LutExe.Goto (zeguard, ctrl') -> (
(* THIS IS THE NORMAL BEHAVIOR *)
MainArg.event_incr opt;
let exe, zeguard, (outs, locs) = try LutExe.find_one_sol exe zeguard
let _exe, zeguard, (outs, locs) = try LutExe.find_one_sol exe zeguard
with Not_found -> assert false
in
(* Try to display more useful source level info with -vl
......
(lang dune 1.11)
......@@ -75,7 +75,7 @@ $(OBJDIR)/bool_utils_au_plus_2_parmi_3.c : $(OBJDIR)/bool_utils_au_plus_2_parmi_
ifndef LUTIN
LUTIN=../../_build/lutin/src/main.native
LUTIN=../../_build/default/bin/lutin/main.exe
endif
run: $(OBJDIR)/$(MAIN).$(DLEXT)
......
......@@ -15,14 +15,13 @@ endif
# XXX pack all those modules into one
CMXA_LIB = dynlink.cmxa unix.cmxa nums.cmxa str.cmxa \
ezdl.cmxa gbddml.cmxa polka.cmxa \
lutils.cmxa rdbg.cmxa lutin-utils.cmxa lutin.cmxa
lutils.cmxa rdbg.cmxa lutinRun.cmxa
CLIB= `ocamlfind query -r rdbg -i-format` \
`ocamlfind query -r lutin -i-format` \
-cclib -lcamlidl -cclib -lgmp
INCLUDE_DIR = -I +gmp -I +camlidl -I +polka -I +gbddml \
-I +rdbg -I +lutin \
-I +ezdl
-I +rdbg -I +lutin -I +ezdl
LUTIN=lutin$(EXE)
......
(* Demonstrate the use of Lutin from Ocaml. *)
let oc = open_out "call_foo.rif"
......@@ -24,9 +23,9 @@ let _ =
let foo_inputs = ["a",I a ; "b", B b; "c", F c] in