ocaml · kit-ty-kate · Jul 11, 2018 · Jul 10, 2018 · Jul 10, 2018 · Jul 11, 2018
diff --git a/packages/dune/dune.1.0.0/descr b/packages/dune/dune.1.0.0/descr
@@ -0,0 +1,18 @@
+Fast, portable and opinionated build system
+
+dune is a build system that was designed to simplify the release of
+Jane Street packages. It reads metadata from "dune" files following a
+very simple s-expression syntax.
+
+dune is fast, it has very low-overhead and support parallel builds on
+all platforms. It has no system dependencies, all you need to build
+dune and packages using dune is OCaml. You don't need or make or bash
+as long as the packages themselves don't use bash explicitly.
+
+dune supports multi-package development by simply dropping multiple
+repositories into the same directory.
+
+It also supports multi-context builds, such as building against
+several opam roots/switches simultaneously. This helps maintaining
+packages across several versions of OCaml and gives cross-compilation
+for free.
diff --git a/packages/dune/dune.1.0.0/opam b/packages/dune/dune.1.0.0/opam
@@ -0,0 +1,17 @@
+opam-version: "1.2"
+maintainer: "opensource@janestreet.com"
+authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+homepage: "https://github.com/ocaml/dune"
+bug-reports: "https://github.com/ocaml/dune/issues"
+dev-repo: "https://github.com/ocaml/dune.git"
+license: "MIT"
+build: [
+  ["ocaml" "configure.ml" "--libdir" lib]
+  ["ocaml" "bootstrap.ml"]
+  ["./boot.exe" "--release" "--subst"] {pinned}
+  ["./boot.exe" "--release" "-j" jobs]
+]
+available: [ ocaml-version >= "4.02.3" ]
+conflicts: [
+  "jbuilder" {!= "transition"}
+]
diff --git a/packages/dune/dune.1.0.0/url b/packages/dune/dune.1.0.0/url
@@ -0,0 +1,2 @@
+archive: "https://github.com/ocaml/dune/releases/download/1.0.0/dune-1.0.0.tbz"
+checksum: "7435bc09a3967bf6da01e6cb7d37ccc3"
diff --git a/packages/jbuilder/jbuilder.transition/descr b/packages/jbuilder/jbuilder.transition/descr
@@ -0,0 +1,2 @@
+This is a transition package, jbuilder is now named dune. Use the dune
+package instead.
diff --git a/packages/jbuilder/jbuilder.transition/opam b/packages/jbuilder/jbuilder.transition/opam
@@ -0,0 +1,13 @@
+opam-version: "1.2"
+maintainer: "opensource@janestreet.com"
+authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+homepage: "https://github.com/ocaml/dune"
+bug-reports: "https://github.com/ocaml/dune/issues"
+dev-repo: "https://github.com/ocaml/dune.git"
+license: "MIT"
+build: []
+depends: ["dune"]
+post-messages: [
+  "Jbuilder has been renamed and the jbuilder package is now a transition"
+  "package. Use the dune package instead."
+]
diff --git a/packages/opam-client/opam-client.2.0.0~rc/opam b/packages/opam-client/opam-client.2.0.0~rc/opam
@@ -24,3 +24,6 @@ depends: [
   "jbuilder" {build & >= "1.0+beta12"}
 ]
 available: [ocaml-version >= "4.02.3"]
+conflicts: [
+  "dune"
+]
diff --git a/packages/opam-core/opam-core.2.0.0~rc/opam b/packages/opam-core/opam-core.2.0.0~rc/opam
@@ -26,3 +26,6 @@ depends: [
   "cppo" {build}
 ]
 available: [ocaml-version >= "4.02.3"]
+conflicts: [
+  "dune"
+]
diff --git a/packages/opam-devel/opam-devel.2.0.0~rc/opam b/packages/opam-devel/opam-devel.2.0.0~rc/opam
@@ -24,6 +24,9 @@ depends: [
   "jbuilder" {build & >= "1.0+beta12"}
 ]
 available: [ocaml-version >= "4.02.3"]
+conflicts: [
+  "dune"
+]
 post-messages: [
   "
 The development version of opam has been successfuly compiled into %{lib}%/%{name}%. You should not run it from there, please install the binaries to your PATH, e.g. with

diff --git a/packages/opam-format/opam-format.2.0.0~rc/opam b/packages/opam-format/opam-format.2.0.0~rc/opam
@@ -23,3 +23,6 @@ depends: [
   "jbuilder" {build & >= "1.0+beta12"}
 ]
 available: [ocaml-version >= "4.02.3"]
+conflicts: [
+  "dune"
+]
diff --git a/packages/opam-installer/opam-installer.2.0.0~rc/opam b/packages/opam-installer/opam-installer.2.0.0~rc/opam
@@ -24,3 +24,6 @@ depends: [
   "jbuilder" {build & >= "1.0+beta12"}
 ]
 available: [ocaml-version >= "4.02.3"]
+conflicts: [
+  "dune"
+]
diff --git a/packages/opam-repository/opam-repository.2.0.0~rc/opam b/packages/opam-repository/opam-repository.2.0.0~rc/opam
@@ -22,3 +22,6 @@ depends: [
   "jbuilder" {build & >= "1.0+beta12"}
 ]
 available: [ocaml-version >= "4.02.3"]
+conflicts: [
+  "dune"
+]
diff --git a/packages/opam-solver/opam-solver.2.0.0~rc/opam b/packages/opam-solver/opam-solver.2.0.0~rc/opam
@@ -25,3 +25,6 @@ depends: [
   "jbuilder" {build & >= "1.0+beta12"}
 ]
 available: [ocaml-version >= "4.02.3"]
+conflicts: [
+  "dune"
+]
diff --git a/packages/opam-state/opam-state.2.0.0~rc/opam b/packages/opam-state/opam-state.2.0.0~rc/opam
@@ -22,3 +22,6 @@ depends: [
   "jbuilder" {build & >= "1.0+beta12"}
 ]
 available: [ocaml-version >= "4.02.3"]
+conflicts: [
+  "dune"
+]
diff --git a/packages/reed-solomon-erasure/reed-solomon-erasure.1.0.1/opam b/packages/reed-solomon-erasure/reed-solomon-erasure.1.0.1/opam
@@ -15,3 +15,6 @@ depends: [
   "ctypes-foreign"
 ]
 available: [ocaml-version >= "4.06"]
+conflicts: [
+  "dune"
+]
diff --git a/packages/yaml/yaml.0.1.0/opam b/packages/yaml/yaml.0.1.0/opam
@@ -26,3 +26,6 @@ build: [
 build-test: [
   ["jbuilder" "runtest"]
 ]
+conflicts: [
+  "dune"
+]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		archive: "https://github.com/ocaml/dune/releases/download/1.0.0/dune-1.0.0.tbz"
		checksum: "7435bc09a3967bf6da01e6cb7d37ccc3"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		This is a transition package, jbuilder is now named dune. Use the dune
		package instead.