From bff39c3426a00ef85650bf195cdf55732da9509d Mon Sep 17 00:00:00 2001
From: Jeremie Dimino <jeremie@dimino.org>
Date: Tue, 10 Jul 2018 17:36:39 +0100
Subject: [PATCH] Remove jbuilder files

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
---
 .travis-ci.sh  | 22 +++++++++-------------
 jbuilder.descr |  2 --
 jbuilder.opam  | 22 ----------------------
 3 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 jbuilder.descr
 delete mode 100644 jbuilder.opam

diff --git a/.travis-ci.sh b/.travis-ci.sh
index 2d8fa6e4..5993ad21 100644
--- a/.travis-ci.sh
+++ b/.travis-ci.sh
@@ -46,8 +46,10 @@ case "$TARGET" in
         rm -rf ~/.opam
         opam init --yes
         eval $(opam config env)
-        opam install ocamlfind utop ppxlib reason odoc menhir ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler--yes
-        opam remove jbuilder `opam list --depends-on jbuilder --installed --short` --yes
+        opam install ocamlfind utop ppxlib reason odoc menhir ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes
+        opam remove --yes dune jbuilder \
+             `opam list --depends-on jbuilder --installed --short` --yes \
+             `opam list --depends-on dune     --installed --short` --yes
         if opam info dune &> /dev/null; then
             opam remove dune `opam list --depends-on dune --installed --short` --yes
         fi
@@ -62,15 +64,11 @@ case "$TARGET" in
       echo -en "travis_fold:start:opam.deps\r"
       DATE=$(date +%Y%m%d)
       eval $(opam config env)
-      if [ $(opam pin list | wc -l) -ne 0 ] ; then
+      for pkg in $(opam pin list --short); do
         UPDATE_OPAM=1
-        opam pin remove jbuilder --no-action --yes
-        opam remove jbuilder --yes
-        if opam pin list -s | grep dune; then
-            opam pin remove dune --no-action --yes
-            opam remove dune --yes || true
-        fi
-      fi
+        opam pin remove $pkg --no-action --yes
+        opam remove $pkg --yes || true
+      done
       if [ ! -e ~/.opam/last-update ] || [ $(cat ~/.opam/last-update) != $DATE ] ; then
         opam update --yes
         echo $DATE> ~/.opam/last-update
@@ -79,9 +77,7 @@ case "$TARGET" in
       fi
       opam list
       echo "version: \"1.0+dev$DATE\"" >> dune.opam
-      echo "depends: [\"dune\"]" >> jbuilder.opam
-      opam pin add dune     . --no-action --yes
-      opam pin add jbuilder . --no-action --yes
+      opam pin add dune . --no-action --yes
       opam install ocamlfind utop ppxlib reason odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes
       echo -en "travis_fold:end:opam.deps\r"
     fi
diff --git a/jbuilder.descr b/jbuilder.descr
deleted file mode 100644
index 20fc285c..00000000
--- a/jbuilder.descr
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a transition package, jbuilder is now named dune. Use the dune
-package instead.
diff --git a/jbuilder.opam b/jbuilder.opam
deleted file mode 100644
index d1cd7e5a..00000000
--- a/jbuilder.opam
+++ /dev/null
@@ -1,22 +0,0 @@
-opam-version: "1.2"
-version: "transition"
-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: []
-# CR-soon diml: uncomment this once we have a dune package in opam.
-# We have to wait otherwise "opam pin add jbuilder --dev" fails with
-# an error that is hard to understand.
-# depends: ["dune"]
-post-messages: [
-  "Jbuilder has been renamed and the jbuilder package is now a transition"
-  "package. Use the dune package instead."
-  ""
-  "If you want to try the development version of Dune before the 1.0.0 is"
-  "released, run the following command:"
-  ""
-  "$ opam pin add dune https://github.com/ocaml/dune.git"
-]