Skip to content

Commit

Permalink
Merge pull request #135 from clarus/coq-optional
Browse files Browse the repository at this point in the history
Set Coq as an optional dependency
  • Loading branch information
clarus authored Jun 14, 2020
2 parents ee8c405 + 3437de5 commit 747b4dc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ script:
sudo chown -R opam:opam /home/project
export OPAMWITHTEST=true
# Check if the package is compatible with the current environment
if [ "${SHOULD_SUPPORT}" = "true" ] || opam install ${PACKAGE_NAME} --show-action; then
if [ "${SHOULD_SUPPORT}" = "true" ] || opam install coq ${PACKAGE_NAME} --show-action; then
# First, install the dependencies
sudo apt-get update
opam depext ${PACKAGE_NAME} -y
opam install coq -y
opam install ${PACKAGE_NAME} --deps-only -y
opam list
# Then, install the package itself in verbose mode
Expand Down
13 changes: 9 additions & 4 deletions coq-of-ocaml.opam
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,28 @@ bug-reports: "https://github.com/clarus/coq-of-ocaml/issues"
authors: ["Guillaume Claret"]
license: "MIT"
build: [
["sh" "-c" "cd OCaml && ./configure.sh"]
[make "-C" "OCaml" "-j%{jobs}%"]
["sh" "-c" "cd OCaml && ./configure.sh"] {coq:installed}
[make "-C" "OCaml" "-j%{jobs}%"] {coq:installed}
[make "-j%{jobs}%"]
[make "test"] {with-test}
]
install: [
[make "-C" "OCaml" "install"]
[make "-C" "OCaml" "install"] {coq:installed}
]
depends: [
"conf-ruby" {with-test}
"coq" {>= "8.11"}
"dune" {build}
"menhir" {build}
"ocaml" {>= "4.09" & < "4.10"}
"smart-print"
"yojson" {>= "1.6.0"}
]
depopts: [
"coq"
]
conflicts: [
"coq" {< "8.11"}
]
tags: [
"keyword:compilation"
"keyword:ocaml"
Expand Down

0 comments on commit 747b4dc

Please sign in to comment.