Commit 258d14f8 authored by Maximilien Colange's avatar Maximilien Colange

Merge branch 'packaging'

parents c6853bca 240d8820
......@@ -5,7 +5,7 @@ INCLUDEDIR=@UDBML_ROOT@/udbml
BUILDDIR=_build
OCAMLBUILD=ocamlbuild -use-ocamlfind -classic-display -build-dir $(BUILDDIR)
OCAMLBUILD=ocamlbuild -use-ocamlfind -classic-display -build-dir $(BUILDDIR) @OCAMLBUILDFLAGS@
UTAP_INCLUDEDIR=@abs_top_srcdir@/utap/src
UTAP_LIB=@abs_top_srcdir@/utap/src/libutap.a
......@@ -17,7 +17,7 @@ XML_LINK_FLAGS=$(foreach i,$(XML_LIBS),-cclib $i)
all-local:
$(OCAMLBUILD) -cflags "-cc g++ $(OCAML_CXX_FLAGS)" timedAutomatonBuilder.o
$(OCAMLBUILD) $(OCAMLBUILDFLAGS) -cflags "-g -noassert -I $(INCLUDEDIR)" -lflags "$(INCLUDEDIR)/udbml.cmxa src/timedAutomatonBuilder.o $(UTAP_LIB) $(XML_LINK_FLAGS) -cclib -L$(INCLUDEDIR)" src/main.native
$(OCAMLBUILD) -cflags "-g -noassert -I $(INCLUDEDIR)" -lflags "$(INCLUDEDIR)/udbml.cmxa src/timedAutomatonBuilder.o $(UTAP_LIB) $(XML_LINK_FLAGS) -cclib -L$(INCLUDEDIR)" src/main.native
cp `readlink -f $(BUILDDIR)/src/main.native` tiamo
clean-local:
......
......@@ -11,7 +11,8 @@ INSTALLATION NOTES
Requires Batteries
- install uppaal-dbm (say in uppaal_prefix)
- have udbm-config in PATH (typically export PATH=uppaal_prefix/bin:$PATH)
- install udbml
- install TiAMO
- install udbml (see github.com/osankur/udbml.git)
- install TiAMo
The script 'build.sh' retrieves udbml, compiles and installing it (locally), then compiles
TiAMo. Simply run this script, or modify it if you want a custom installation.
......@@ -2,26 +2,17 @@
INSTALL_DIR=$PWD/local
# build UPPAAL-DBM
git clone https://github.com/airbornemihir/uppaal-dbm.git
cd uppaal-dbm/modules
echo "./configure --prefix=$INSTALL_DIR AR=ar CFLAGS=-O3 -DNDEBUG $CFLAGS CPPFLAGS=$CPPFLAGS LDFLAGS=$LDFLAGS"
./configure --prefix=$INSTALL_DIR AR=ar CFLAGS="-O3 -DNDEBUG $CFLAGS" CPPFLAGS=$CPPFLAGS LDFLAGS=$LDFLAGS
make
make install
cd ../..
# build udbml
# get UDBML
git clone https://github.com/osankur/udbml.git
cd udbml
autoreconf -vfi
./configure PATH=$INSTALL_DIR/uppaal/bin:$PATH --prefix=$INSTALL_DIR
./configure --prefix=$INSTALL_DIR AR=ar CFLAGS="-O3 -DNDEBUG $CFLAGS" CPPFLAGS=$CPPFLAGS LDFLAGS=$LDFLAGS
make
make install
cd ..
# build tiamo
autoreconf -vfi
./configure --with-udbml=$INSTALL_DIR
./configure --with-udbml=$INSTALL_DIR OCAMLBUILDFLAGS="-X local -X udbml"
make clean
OCAMLBUILDFLAGS="-X local -X uppaal-dbm -X udbml" make
make
......@@ -40,6 +40,8 @@ AC_SUBST(XML_CONFIG)
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
AC_SUBST(OCAMLBUILDFLAGS)
AC_CONFIG_SUBDIRS([utap])
# the files to be produced
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment