Skip to content

Commit

Permalink
Move the depends field to dune.opam.template
Browse files Browse the repository at this point in the history
So that we can have the special dependency on ocaml

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
  • Loading branch information
jeremiedimino committed Feb 12, 2020
1 parent b3ebc84 commit 5282b0c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ install: bash -ex .travis-ci.sh prepare
script: bash -ex .travis-ci.sh build

# Please keep the list in sync with the minimal version of OCaml in
# dune-project and bootstrap.ml
# dune-project, dune.opam.template and bootstrap.ml

matrix:
include:
Expand Down
7 changes: 1 addition & 6 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,7 @@

(package
(name dune)
(depends
;; Please keep the lower bound in sync with .travis.yml and
;; min_ocaml_version in bootstrap.ml
(ocaml (>= 4.07))
base-unix
base-threads)
; The "depends" and "build" field are written in dune.opam.template
(conflicts
(odoc (< 1.3.0))
(dune-release (< 1.3.0))
Expand Down
12 changes: 7 additions & 5 deletions dune.opam
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ license: "MIT"
homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"ocaml" {>= "4.07"}
"base-unix"
"base-threads"
]
conflicts: [
"odoc" {< "1.3.0"}
"dune-release" {< "1.3.0"}
Expand All @@ -43,3 +38,10 @@ build: [
["ocaml" "bootstrap.ml" "-j" jobs]
["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs]
]
depends: [
# Please keep the lower bound in sync with .travis.yml and
# min_ocaml_version in bootstrap.ml
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
7 changes: 7 additions & 0 deletions dune.opam.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ build: [
["ocaml" "bootstrap.ml" "-j" jobs]
["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs]
]
depends: [
# Please keep the lower bound in sync with .travis.yml, dune-project
# and min_ocaml_version in bootstrap.ml
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]

0 comments on commit 5282b0c

Please sign in to comment.