From 273aea8391841d2ef421d3e5463fd49af57cced3 Mon Sep 17 00:00:00 2001
From: Andrew Jeffery <dev@jeffas.io>
Date: Wed, 24 Jun 2020 22:32:07 +0100
Subject: [PATCH] Makefile: update jbuilder to dune

This also adds the missing dune-workspace.dev with some extra versions
and an all target corresponding to dune's @all.
---
 Makefile           | 23 +++++++++++++----------
 dune-workspace.dev |  7 +++++++
 2 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 dune-workspace.dev

diff --git a/Makefile b/Makefile
index 1f8e213..d0e3c05 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,17 @@
+all:
+	dune build @all
+
 build:
-		jbuilder build
+	dune build
 
 test:
-		jbuilder runtest
+	dune runtest
 
 doc:
-		jbuilder build @doc
+	dune build @doc
 
 clean:
-		jbuilder clean
+	dune clean
 
 .PHONY: build test doc clean
 
@@ -17,13 +20,13 @@ NAME_VERSION := $$(opam query --name-version)
 ARCHIVE      := $$(opam query --archive)
 
 release:
-		git tag -a v$(VERSION) -m "Version $(VERSION)."
-		git push origin v$(VERSION)
-		opam publish prepare $(NAME_VERSION) $(ARCHIVE)
-		opam publish submit $(NAME_VERSION)
-		rm -rf $(NAME_VERSION)
+	git tag -a v$(VERSION) -m "Version $(VERSION)."
+	git push origin v$(VERSION)
+	opam publish prepare $(NAME_VERSION) $(ARCHIVE)
+	opam publish submit $(NAME_VERSION)
+	rm -rf $(NAME_VERSION)
 
 .PHONY: gh-pages release all-supported-ocaml-versions
 
 all-supported-ocaml-versions:
-	jbuilder build @install @runtest --workspace jbuild-workspace.dev
+	dune build @install @runtest --workspace dune-workspace.dev
diff --git a/dune-workspace.dev b/dune-workspace.dev
new file mode 100644
index 0000000..67e0e49
--- /dev/null
+++ b/dune-workspace.dev
@@ -0,0 +1,7 @@
+(lang dune 1.0)
+;; This file is used by `make all-supported-ocaml-versions`
+(context (opam (switch 4.04.0)))
+(context (opam (switch 4.05.0)))
+(context (opam (switch 4.06.0)))
+(context (opam (switch 4.07.0)))
+(context (opam (switch 4.08.0)))