Update everything.

Drup · Aug 30, 2018 · 0de0dc9 · 0de0dc9
1 parent defe41e
commit 0de0dc9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -1,15 +1,11 @@
 default: all
 
 all:
-	jbuilder build @install --dev
-
+	dune build
 test:
-	jbuilder runtest
+	dune runtest
 
 clean:
-	jbuilder clean
-
-doc:
-	jbuilder build @doc
+	dune clean
 
-.PHONY: all test clean doc
+.PHONY: all test clean
diff --git a/bytepdf.opam b/bytepdf.opam
@@ -8,15 +8,12 @@ bug-reports: "https://github.com/Drup/bytepdf/issues"
 dev-repo: "git+https://github.com/Drup/bytepdf.git"
 
 depends: [
-  "jbuilder" {build}
-  "obytelib"
+  "dune" {build}
+  "obytelib" { >= "1.4" }
   "camlpdf"
 ]
 available: ocaml-version >= "4.03"
 build: [
-  ["jbuilder" "subst" "-n" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs "@install"]
-]
-build-test: [
-  ["jbuilder" "runtest" "-p" name]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
diff --git a/dune b/dune
@@ -0,0 +1,6 @@
+(executable
+ (name        bytepdf)
+ (public_name bytepdf)
+ (modules     Bytepdf)
+ (libraries   obytelib camlpdf cmdliner containers bos))
+
diff --git a/dune-project b/dune-project
@@ -0,0 +1 @@
+(lang dune 1.1)
diff --git a/jbuild b/jbuild