Commit e6e8afd9 authored by Guillaume Melquiond's avatar Guillaume Melquiond

Merge branch 'next' into new_ide

parents 8e93bffe a75123f6
FROM ocaml/ocaml:debian-stable
# install dependencies
RUN apt-get update && \
apt-get install -y wget libgmp-dev gtk+-2.0 libgtksourceview2.0-dev gnome-themes-standard libcanberra-gtk-module opam
ARG debian_packages
RUN apt-get update
RUN apt-get install -y wget libgmp-dev gtk+-2.0 libgtksourceview2.0-dev gnome-themes-standard libcanberra-gtk-module opam xvfb
RUN apt-get install -y $debian_packages
RUN apt-get clean
# create user
RUN sudo adduser --disabled-password --gecos '' why3
......@@ -14,5 +17,6 @@ ARG compiler=system
RUN opam init -a -y -j1 --compiler=$compiler
RUN opam repository add coq-released https://coq.inria.fr/opam/released
ARG packages
RUN opam install -y menhir conf-gtksourceview lablgtk ocamlgraph zarith camlzip alt-ergo $packages
ARG opam_packages
RUN opam install -y menhir conf-gtksourceview lablgtk ocamlgraph zarith camlzip alt-ergo
RUN test -z "$opam_packages" || opam install -y $opam_packages
......@@ -3,12 +3,12 @@
set -e
autoconf && (automake --add-missing 2> /dev/null || true)
if test -n "$PACKAGES"; then
IMAGE=bench-image-$COMPILER--$(echo $PACKAGES | sed -e 's/ /--/g')
if test -n "$DEBIAN_PACKAGES" -o -n "$OPAM_PACKAGES"; then
IMAGE=bench-image-$COMPILER--$(echo $DEBIAN_PACKAGES | sed -e 's/ /--/g')--$(echo $OPAM_PACKAGES | sed -e 's/ /--/g')
else
IMAGE=bench-image-$COMPILER
fi
docker build -t $IMAGE -f misc/Dockerfile.init --build-arg compiler=$COMPILER --build-arg packages="$PACKAGES" .
docker build -t $IMAGE --force-rm -f misc/Dockerfile.init --build-arg compiler=$COMPILER --build-arg debian_packages="$DEBIAN_PACKAGES" --build-arg opam_packages="$OPAM_PACKAGES" .
CID=$(docker create --rm -i -w /home/why3/why3 $IMAGE /bin/sh)
docker start $CID
docker cp . $CID:/home/why3/why3
......
......@@ -20,7 +20,16 @@ eval `opam config env`
./configure --enable-local
make
if test "$1" = bench; then
bin/why3config --detect-provers
make bench
fi
while test $# -gt 0
do
case "$1" in
bench)
bin/why3config --detect-provers
make bench
;;
doc)
make doc
;;
esac
shift
done
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