Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
why3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
126
Issues
126
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Why3
why3
Commits
273f47ff
Commit
273f47ff
authored
May 29, 2018
by
Guillaume Melquiond
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix/v0.88' into next
parents
6563fac9
b2dd7d9e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
14 deletions
+30
-14
Makefile.in
Makefile.in
+1
-1
configure.in
configure.in
+16
-5
misc/Dockerfile.deploy
misc/Dockerfile.deploy
+1
-1
misc/Dockerfile.init
misc/Dockerfile.init
+4
-4
misc/ci-docker.sh
misc/ci-docker.sh
+7
-2
misc/ci-local.sh
misc/ci-local.sh
+1
-1
No files found.
Makefile.in
View file @
273f47ff
...
...
@@ -76,7 +76,7 @@ EMACS = @EMACS@
#PSVIEWER = @PSVIEWER@
#PDFVIEWER = @PDFVIEWER@
INCLUDES
=
@ZIPINCLUDE@ @MENHIRINCLUDE@
INCLUDES
=
@ZIPINCLUDE@ @MENHIRINCLUDE@
@NUMINCLUDE@
# warnings are enabled and non fatal by default, except:
# - disabled:
...
...
configure.in
View file @
273f47ff
...
...
@@ -357,16 +357,25 @@ if test "$enable_emacs_compilation" = yes ; then
fi
# checking for Num
DIR=
# (ocamlfind cannot be trusted here, since the default installation path is $OCAMLLIB)
found_num=no
if test "$USEOCAMLFIND" = yes; then
DIR=$(ocamlfind query num)
if test -n "$DIR"; then
echo "ocamlfind found num in $DIR"
NUMINCLUDE="-I $DIR"
found_num=yes
AC_CHECK_FILE($DIR/nums.cma,,found_num=no)
AC_CHECK_FILE($DIR/num.cmi,,found_num=no)
fi
fi
DIR="$OCAMLLIB"
AC_CHECK_FILE($DIR/nums.cma,,found_num=no)
AC_CHECK_FILE($DIR/num.cmi,,found_num=no)
if test "$found_num" = no; then
DIR="$OCAMLLIB"
NUMINCLUDE=
found_num=yes
AC_CHECK_FILE($DIR/nums.cma,,found_num=no)
AC_CHECK_FILE($DIR/num.cmi,,found_num=no)
fi
if test "$found_num" = no; then
AC_MSG_ERROR([Library Num not found.])
fi
...
...
@@ -399,7 +408,7 @@ if test "$enable_zarith" = yes; then
else
BIGINTLIB=nums
BIGINTPKG=num
BIGINTINCLUDE=
BIGINTINCLUDE=
"$NUMINCLUDE"
fi
# checking for camlzip
...
...
@@ -838,6 +847,8 @@ AC_SUBST(LABLGTK2PKG)
AC_SUBST(META_OCAMLGRAPH)
AC_SUBST(NUMINCLUDE)
AC_SUBST(enable_zarith)
AC_SUBST(BIGINTINCLUDE)
AC_SUBST(BIGINTLIB)
...
...
misc/Dockerfile.deploy
View file @
273f47ff
...
...
@@ -11,7 +11,7 @@ WORKDIR /home/why3/why3
RUN eval `opam config env` && \
./configure && \
make
-j2
make
USER root
...
...
misc/Dockerfile.init
View file @
273f47ff
...
...
@@ -11,8 +11,8 @@ ENV HOME /home/why3
WORKDIR /home/why3
ARG compiler=system
RUN opam init -a -y -j
2
--compiler=$compiler
RUN opam
install -y menhir conf-gtksourceview lablgtk ocamlgraph zarith camlzip
RUN opam init -a -y -j
1
--compiler=$compiler
RUN opam
repository add coq-released https://coq.inria.fr/opam/released
# Alt-Ergo
RUN opam install
alt-ergo.1.30
ARG packages
RUN opam install
-y menhir conf-gtksourceview lablgtk ocamlgraph zarith camlzip alt-ergo $packages
misc/ci-docker.sh
View file @
273f47ff
...
...
@@ -3,8 +3,13 @@
set
-e
autoconf
&&
(
automake
--add-missing
2> /dev/null
||
true
)
docker build
-t
bench-image-
$COMPILER
-f
misc/Dockerfile.init
--build-arg
compiler
=
$COMPILER
.
CID
=
$(
docker create
--rm
-i
-w
/home/why3/why3 bench-image-
$COMPILER
/bin/sh
)
if
test
-n
"
$PACKAGES
"
;
then
IMAGE
=
bench-image-
$COMPILER
--
$(
echo
$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
"
.
CID
=
$(
docker create
--rm
-i
-w
/home/why3/why3
$IMAGE
/bin/sh
)
docker start
$CID
docker
cp
.
$CID
:/home/why3/why3
docker
exec
-u
root
$CID
chown
-R
why3:why3 /home/why3/why3
...
...
misc/ci-local.sh
View file @
273f47ff
...
...
@@ -18,7 +18,7 @@ set -e
eval
`
opam config
env
`
./configure
--enable-local
make
-j2
make
if
test
"
$1
"
=
bench
;
then
bin/why3config
--detect-provers
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment