use dune

META.cohttp.template

@@ -1,4 +1,4 @@
-# JBUILDER_GEN
+# DUNE_GEN
 
 package "top" (
   description = "Deprecated. Use cohttp-top directly"

Makefile

@@ -1,34 +1,13 @@
-.PHONY: build clean test install uninstall clean all-supported-ocaml-versions
+.PHONY: build clean test clean all-supported-ocaml-versions
 
 build:
-	jbuilder build --dev @install
+	dune build
 
 test:
-	jbuilder runtest
-
-install:
-	jbuilder install
-
-uninstall:
-	jbuilder uninstall
+	dune runtest
 
 clean:
-	rm -rf _build *.install
-
-REPO=../../mirage/mirage-dev
-PACKAGES=$(REPO)/packages
-# until we have https://github.com/ocaml/opam-publish/issues/38
-pkg-%:
-	topkg opam pkg -n $*
-	mkdir -p $(PACKAGES)/$*
-	cp -r _build/$*.* $(PACKAGES)/$*/
-	cd $(PACKAGES) && git add $*
+	dune clean
 
 all-supported-ocaml-versions:
-	jbuilder build --dev @install @runtest --workspace jbuild-workspace.dev
-
-PKGS=$(basename $(wildcard *.opam))
-opam-pkg:
-	$(MAKE) $(PKGS:%=pkg-%)
-
-
+	dune build @install @runtest --workspace jbuild-workspace.dev

cohttp-async.opam

@@ -15,12 +15,12 @@ license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 dev-repo: "https://github.com/mirage/ocaml-cohttp.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+build-test: ["dune" "runtest" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.1.0"}
   "async_kernel" {>= "v0.11.0"}
   "async_unix" {>= "v0.11.0"}
   "async_extra" {>= "v0.11.0"}

cohttp-async/bin/dune

@@ -0,0 +1,6 @@
+(executables
+ (names         cohttp_curl_async cohttp_server_async)
+  (package      cohttp-async)
+  (public_names cohttp-curl-async cohttp-server-async)
+  (libraries    cohttp-async async_kernel async_extra async_unix base
+                cohttp cohttp_server fmt.tty))

cohttp-async/src/dune

@@ -0,0 +1,7 @@
+(library
+  (name        cohttp_async)
+  (synopsis    "Async backend")
+  (public_name cohttp-async)
+  (libraries   logs.fmt base fmt async_unix async_kernel async_extra uri
+               uri.services ipaddr.unix conduit-async magic-mime cohttp)
+  (preprocess (pps ppx_sexp_conv)))

cohttp-async/test/dune

@@ -0,0 +1,5 @@
+(test
+  (name      test_async_integration)
+  (package   cohttp-async)
+  (libraries cohttp_async_test async_unix base core async_kernel oUnit
+             cohttp-async))

cohttp-lwt-jsoo.opam

@@ -15,12 +15,12 @@ license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 dev-repo: "https://github.com/mirage/ocaml-cohttp.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+build-test: ["dune" "runtest" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.1.0"}
   "cohttp" {>= "1.0.0"}
   "cohttp-lwt" {>= "1.0.0"}
   "lwt" {>="3.0.0"}

cohttp-lwt-jsoo/src/dune

@@ -0,0 +1,7 @@
+(library
+  (name        cohttp_lwt_jsoo)
+  (public_name cohttp-lwt-jsoo)
+  (synopsis    "XHR/Lwt based http client")
+  (wrapped     false)
+  (preprocess  (pps js_of_ocaml-ppx))
+  (libraries   js_of_ocaml cohttp-lwt))

cohttp-lwt-unix.opam

@@ -15,12 +15,12 @@ license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 dev-repo: "https://github.com/mirage/ocaml-cohttp.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+build-test: ["dune" "runtest" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.1.0"}
   "conduit-lwt-unix" {>="1.0.3"}
   "cmdliner"
   "magic-mime"

cohttp-lwt-unix/bin/dune

@@ -0,0 +1,6 @@
+(executables
+  (names        cohttp_curl_lwt cohttp_proxy_lwt cohttp_server_lwt)
+  (libraries    cohttp-lwt-unix cohttp_server logs logs.lwt logs.fmt logs.cli
+                cmdliner)
+  (package      cohttp-lwt-unix)
+  (public_names cohttp-curl-lwt cohttp-proxy-lwt cohttp-server-lwt))

cohttp-lwt-unix/src/dune

@@ -0,0 +1,7 @@
+(library
+  (name        cohttp_lwt_unix)
+  (public_name cohttp-lwt-unix)
+  (synopsis    "Lwt/Unix backend for Cohttp")
+  (preprocess  (pps ppx_sexp_conv))
+  (libraries   fmt logs logs.lwt conduit-lwt-unix magic-mime lwt.unix cohttp
+               cohttp-lwt))

cohttp-lwt-unix/test/dune

@@ -0,0 +1,11 @@
+(test
+  (libraries cohttp-lwt-unix oUnit lwt.unix)
+  (package   cohttp-lwt-unix)
+  (modules   test_parser)
+  (name      test_parser))
+
+(test
+ (libraries cohttp_lwt_unix_test cohttp-lwt-unix)
+ (package   cohttp-lwt-unix)
+ (modules   test_sanity)
+ (name      test_sanity))

cohttp-lwt.opam

@@ -15,12 +15,12 @@ license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 dev-repo: "https://github.com/mirage/ocaml-cohttp.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+build-test: ["dune" "runtest" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.1.0"}
   "cohttp" {>= "1.0.0"}
   "lwt"
   "sexplib"

cohttp-lwt/src/dune

@@ -0,0 +1,6 @@
+(library
+  (name        cohttp_lwt)
+  (public_name cohttp-lwt)
+  (synopsis    "Lwt backend")
+  (preprocess  (pps ppx_sexp_conv))
+  (libraries   lwt uri cohttp))

cohttp-mirage.opam

@@ -10,12 +10,12 @@ license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 dev-repo: "https://github.com/mirage/ocaml-cohttp.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+build-test: ["dune" "runtest" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.1.0"}
   "result"
   "mirage-flow-lwt" {>= "1.2.0"}
   "mirage-channel-lwt" {>= "3.0.0"}

cohttp-mirage/src/dune

@@ -0,0 +1,7 @@
+(library
+  (name        cohttp_mirage)
+  (public_name cohttp-mirage)
+  (synopsis    "Mirage backend for cohttp")
+  (wrapped false)
+  (libraries   cohttp-lwt mirage-channel-lwt mirage-conduit sexplib
+               mirage-flow-lwt magic-mime astring))

cohttp-top.opam

@@ -15,12 +15,12 @@ license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 dev-repo: "https://github.com/mirage/ocaml-cohttp.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+build-test: ["dune" "runtest" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.1.0"}
   "cohttp"
 ]
 available: [ocaml-version >= "4.03.0"]

cohttp-top/src/dune

@@ -0,0 +1,4 @@
+(library
+  (name        cohttp_top)
+  (public_name cohttp-top)
+  (libraries   cohttp compiler-libs.toplevel))

cohttp.opam

@@ -15,12 +15,12 @@ license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 dev-repo: "https://github.com/mirage/ocaml-cohttp.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+build-test: ["dune" "runtest" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.1.0"}
   "re" {>= "1.7.2"}
   "uri" {>= "1.9.0"}
   "fieldslib"