Convert from Jbuilder to Dune

ocaml-ppx · Apr 3, 2019 · bda97b2 · bda97b2
1 parent b502133
commit bda97b2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -2,15 +2,15 @@ INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)
 
 .PHONY: all
 all:
-	jbuilder build @install
+	dune build
 
 .PHONY: install
 install:
-	jbuilder install $(INSTALL_ARGS)
+	dune install $(INSTALL_ARGS)
 
 .PHONY: uninstall
 uninstall:
-	jbuilder uninstall $(INSTALL_ARGS)
+	dune uninstall $(INSTALL_ARGS)
 
 .PHONY: reinstall
 reinstall:
@@ -19,5 +19,4 @@ reinstall:
 
 .PHONY: clean
 clean:
-	rm -rf _build *.install
-	find . -name .merlin -delete
+	dune clean
diff --git a/dune-project b/dune-project
@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name ppx_derivers)
diff --git a/ppx_derivers.opam b/ppx_derivers.opam
@@ -6,8 +6,8 @@ homepage: "https://github.com/ocaml-ppx/ppx_derivers"
 bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues"
 dev-repo: "git://github.com/ocaml-ppx/ppx_derivers.git"
 build: [
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "jbuilder" {>= "1.0+beta7"}
+  "dune" {build}
 ]
diff --git a/src/dune b/src/dune
@@ -0,0 +1,3 @@
+(library
+ (name ppx_derivers)
+ (public_name ppx_derivers))
diff --git a/src/jbuild b/src/jbuild