Merge pull request #6 from hcarty/dune

hcarty · web-flow · commit a59f7bd1745b · 2019-06-26T16:07:11.000-06:00
Update to dune and opam 2.x
diff --git a/Makefile b/Makefile
@@ -1,23 +1,22 @@
 .PHONY: all test benchmark doc repl clean gh-pages
 
 all:
-	jbuilder build --dev
+	dune build
 
 test:
-	jbuilder runtest --dev
+	dune runtest
 
 benchmark:
-	jbuilder build benchmark/bench.exe
-	_build/default/benchmark/bench.exe
+	dune exec benchmark/bench.exe
 
 doc:
-	jbuilder build @doc
+	dune build @doc
 
 repl:
-	jbuilder utop src
+	dune utop src
 
 clean:
-	jbuilder clean
+	dune clean
 
 gh-pages: doc
 	git clone `git config --get remote.origin.url` .gh-pages --reference .
diff --git a/benchmark/dune b/benchmark/dune
@@ -0,0 +1,3 @@
+(executable
+ (name bench)
+ (libraries ezgzip benchmark))
diff --git a/benchmark/jbuild b/benchmark/jbuild
diff --git a/dune-project b/dune-project
@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name ezgzip)
diff --git a/ezgzip.opam b/ezgzip.opam
@@ -1,22 +1,25 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "Hezekiah M. Carty <hez@0ok.org>"
 authors: [ "Hezekiah M. Carty <hez@0ok.org>" ]
 license: "MIT"
+synopsis: "Simple gzip (de)compression library"
 homepage: "https://github.com/hcarty/ezgzip"
-dev-repo: "https://github.com/hcarty/ezgzip.git"
+dev-repo: "git+https://github.com/hcarty/ezgzip.git"
 bug-reports: "https://github.com/hcarty/ezgzip/issues"
-build: ["jbuilder" "build" "-p" name "-j" jobs]
-build-test: ["jbuilder" "runtest" "-p" name]
-build-doc: [ "jbuilder" "build" "@doc" "-p" name]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "-p" name "-j" jobs] {with-doc}
+]
 depends: [
-  "alcotest" {test & >= "0.8.1"}
+  "alcotest" {with-test & >= "0.8.1"}
   "astring"
-  "benchmark" {test & >= "1.4"}
-  "jbuilder" {build & >= "1.0+beta13"}
+  "benchmark" {with-test & >= "1.4"}
+  "dune" {>= "1.0"}
   "ocplib-endian"
-  "odoc" {doc & >= "1.1.1"}
-  "qcheck" {test & >= "0.7"}
+  "odoc" {with-doc & >= "1.1.1"}
+  "qcheck" {with-test & >= "0.7"}
   "rresult"
   "camlzip"
+  "ocaml" {>= "4.03.0"}
 ]
-available: [ ocaml-version >= "4.03.0" ]
diff --git a/src/dune b/src/dune
@@ -0,0 +1,4 @@
+(library
+ (name ezgzip)
+ (public_name ezgzip)
+ (libraries astring ocplib-endian rresult camlzip))
diff --git a/src/jbuild b/src/jbuild
diff --git a/test/dune b/test/dune
@@ -0,0 +1,10 @@
+(executable
+ (name test)
+ (libraries alcotest ezgzip qcheck))
+
+(alias
+ (name runtest)
+ (deps
+  (:< test.exe))
+ (action
+  (run %{<} --color=always)))
diff --git a/test/jbuild b/test/jbuild

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+(executable`
	`2`	`+ (name bench)`
	`3`	`+ (libraries ezgzip benchmark))`