Skip to content

Commit

Permalink
Merge pull request #410 from talex5/dune3
Browse files Browse the repository at this point in the history
Update to Dune 3
  • Loading branch information
talex5 authored Jan 23, 2023
2 parents 80f1486 + b81bd0d commit 494d1d1
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 20 deletions.
2 changes: 1 addition & 1 deletion doc/dune
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(mdx
(package eio_main)
(packages eio_main)
(deps (package eio_main))
(files multicore.md))
2 changes: 1 addition & 1 deletion dune
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(mdx
(package eio_main)
(packages eio_main)
(deps (package eio_main))
(preludes doc/prelude.ml)
(files README.md))
4 changes: 2 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(lang dune 2.9)
(lang dune 3.0)
(name eio)
(formatting disabled)
(generate_opam_files true)
Expand Down Expand Up @@ -58,4 +58,4 @@
(eio_linux (and (= :version) (= :os "linux")))
(mdx (and (>= 1.10.0) :with-test))
(eio_luv (= :version))))
(using mdx 0.1)
(using mdx 0.2)
4 changes: 1 addition & 3 deletions eio.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-multicore/eio"
doc: "https://ocaml-multicore.github.io/eio/"
bug-reports: "https://github.com/ocaml-multicore/eio/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"ocaml" {>= "5.0.0"}
"bigstringaf" {>= "0.9.0"}
"cstruct" {>= "6.0.1"}
Expand Down Expand Up @@ -38,11 +38,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
4 changes: 1 addition & 3 deletions eio_linux.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-multicore/eio"
doc: "https://ocaml-multicore.github.io/eio/"
bug-reports: "https://github.com/ocaml-multicore/eio/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"alcotest" {>= "1.4.0" & with-test}
"eio" {= version}
"mdx" {>= "1.10.0" & with-test}
Expand All @@ -28,11 +28,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
4 changes: 1 addition & 3 deletions eio_luv.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-multicore/eio"
doc: "https://ocaml-multicore.github.io/eio/"
bug-reports: "https://github.com/ocaml-multicore/eio/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"eio" {= version}
"luv" {>= "0.5.11"}
"luv_unix" {>= "0.5.0"}
Expand All @@ -26,11 +26,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
4 changes: 1 addition & 3 deletions eio_main.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-multicore/eio"
doc: "https://ocaml-multicore.github.io/eio/"
bug-reports: "https://github.com/ocaml-multicore/eio/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"eio_linux" {= version & os = "linux"}
"mdx" {>= "1.10.0" & with-test}
"eio_luv" {= version}
Expand All @@ -24,11 +24,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
2 changes: 1 addition & 1 deletion lib_eio/tests/dune
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(mdx
(package eio)
(packages eio))
(deps (package eio)))
2 changes: 1 addition & 1 deletion lib_eio_linux/tests/dune
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
(mdx
(package eio_linux)
(enabled_if (= %{system} "linux"))
(packages eio_linux))
(deps (package eio_linux)))
2 changes: 1 addition & 1 deletion lib_eio_luv/tests/dune
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(mdx
(package eio_luv)
(packages eio_luv))
(deps (package eio_luv)))
2 changes: 1 addition & 1 deletion tests/dune
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(mdx
(package eio_main)
(packages eio_main))
(deps (package eio_main)))

0 comments on commit 494d1d1

Please sign in to comment.