Merge pull request #161 from avsm/port-to-dune

port to dune
inhabitedtype · Feb 9, 2019 · 071e6eb · 071e6eb
2 parents 5289e8f + 470687c
commit 071e6eb
Show file tree

Hide file tree

Showing 22 changed files with 93 additions and 107 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,19 +8,17 @@ env:
   global:
   - PINS="angstrom-async:. angstrom-lwt-unix:. angstrom-unix:. angstrom:."
   matrix:
-  - PACKAGE="angstrom"          DISTRO="ubuntu-16.04"    OCAML_VERSION="4.06"
-  - PACKAGE="angstrom-async"    DISTRO="ubuntu-16.04"    OCAML_VERSION="4.06"
-  - PACKAGE="angstrom-lwt-unix" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.06"
-  - PACKAGE="angstrom-unix"     DISTRO="ubuntu-16.04"    OCAML_VERSION="4.06"
-  - PACKAGE="angstrom"          DISTRO="ubuntu-16.04"    OCAML_VERSION="4.04"
-  - PACKAGE="angstrom-async"    DISTRO="ubuntu-16.04"    OCAML_VERSION="4.04"
-  - PACKAGE="angstrom-lwt-unix" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.04"
-  - PACKAGE="angstrom-unix"     DISTRO="ubuntu-16.04"    OCAML_VERSION="4.04"
+  - PACKAGE="angstrom"          DISTRO="ubuntu-lts"      OCAML_VERSION="4.07"
+  - PACKAGE="angstrom-async"    DISTRO="ubuntu-lts"      OCAML_VERSION="4.07"
+  - PACKAGE="angstrom-lwt-unix" DISTRO="ubuntu-lts"      OCAML_VERSION="4.07"
+  - PACKAGE="angstrom-unix"     DISTRO="ubuntu-lts"      OCAML_VERSION="4.07"
+  - PACKAGE="angstrom"          DISTRO="ubuntu-lts"      OCAML_VERSION="4.04"
+  - PACKAGE="angstrom-async"    DISTRO="ubuntu-lts"      OCAML_VERSION="4.04"
+  - PACKAGE="angstrom-lwt-unix" DISTRO="ubuntu-lts"      OCAML_VERSION="4.04"
+  - PACKAGE="angstrom-unix"     DISTRO="ubuntu-lts"      OCAML_VERSION="4.04"
   - PACKAGE="angstrom"          DISTRO="alpine"          OCAML_VERSION="4.03"
-  - PACKAGE="angstrom-async"    DISTRO="alpine"          OCAML_VERSION="4.03"
   - PACKAGE="angstrom-lwt-unix" DISTRO="alpine"          OCAML_VERSION="4.03"
   - PACKAGE="angstrom-unix"     DISTRO="alpine"          OCAML_VERSION="4.03"
   - PACKAGE="angstrom"          DISTRO="debian-unstable" OCAML_VERSION="4.03"
-  - PACKAGE="angstrom-async"    DISTRO="debian-unstable" OCAML_VERSION="4.03"
   - PACKAGE="angstrom-lwt-unix" DISTRO="debian-unstable" OCAML_VERSION="4.03"
   - PACKAGE="angstrom-unix"     DISTRO="debian-unstable" OCAML_VERSION="4.03"
diff --git a/Makefile b/Makefile
@@ -1,19 +1,21 @@
-.PHONY: all build clean test
+.PHONY: all build clean test install uninstall doc
 
 build:
-	jbuilder build --dev @install
+	dune build
 
 all: build
 
 test:
-	jbuilder runtest --dev
+	dune runtest
 
 install:
-	jbuilder install --dev
+	dune install
 
 uninstall:
-	jbuilder uninstall
+	dune uninstall
+
+doc:
+	dune build @doc
 
 clean:
 	rm -rf _build *.install
-
diff --git a/angstrom-async.opam b/angstrom-async.opam
@@ -7,14 +7,14 @@ homepage: "https://github.com/inhabitedtype/angstrom"
 bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
 dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "ocaml" {>= "4.03.0"}
-  "jbuilder" {build & >= "1.0+beta10"}
+  "ocaml" {>= "4.04.1"}
+  "dune" {build & >= "1.0"}
   "angstrom" {>= "0.7.0"}
-  "async" {>= "v0.9.0"}
+  "async" {>= "v0.10.0"}
 ]
 synopsis: "Async support for Angstrom"
diff --git a/angstrom-lwt-unix.opam b/angstrom-lwt-unix.opam
@@ -6,13 +6,13 @@ homepage: "https://github.com/inhabitedtype/angstrom"
 bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
 dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
   "ocaml" {>= "4.03.0"}
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.0"}
   "angstrom"
   "lwt"
   "base-unix"

diff --git a/angstrom-unix.opam b/angstrom-unix.opam
@@ -6,13 +6,13 @@ homepage: "https://github.com/inhabitedtype/angstrom"
 bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
 dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
   "ocaml" {>= "4.03.0"}
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.0"}
   "angstrom"
   "base-unix"
 ]

diff --git a/angstrom.opam b/angstrom.opam
@@ -6,13 +6,13 @@ homepage: "https://github.com/inhabitedtype/angstrom"
 bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
 dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
   "ocaml" {>= "4.03.0"}
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build & >= "1.0"}
   "alcotest" {with-test & >= "0.8.1"}
   "bigstringaf"
   "result"

diff --git a/async/dune b/async/dune
@@ -0,0 +1,5 @@
+(library
+ (name angstrom_async)
+ (public_name angstrom-async)
+ (flags :standard -safe-string)
+ (libraries angstrom async))
diff --git a/async/jbuild b/async/jbuild
diff --git a/benchmarks/async_benchmark.ml b/benchmarks/async_benchmark.ml
@@ -16,5 +16,5 @@ let main parser () =
 
 let () =
   let parser = Command.Arg_type.of_alist_exn ["http", `Http; "json", `Json] in
-  Command.(async ~summary:"async benchmark"
+  Command.(async_spec ~summary:"async benchmark"
     Spec.(empty +> Param.(anon ("PARSER" %: parser))) main |> run)
diff --git a/benchmarks/dune b/benchmarks/dune
@@ -0,0 +1,14 @@
+(executables
+ (libraries angstrom core_bench threads RFC2616 RFC7159)
+ (modules pure_benchmark)
+ (names pure_benchmark))
+
+(executables
+ (libraries angstrom-async RFC2616 RFC7159)
+ (modules async_benchmark)
+ (names async_benchmark))
+
+(executables
+ (libraries angstrom-lwt-unix RFC2616 RFC7159)
+ (modules lwt_benchmark)
+ (names lwt_benchmark))
diff --git a/benchmarks/jbuild b/benchmarks/jbuild
diff --git a/dune-project b/dune-project
@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name angstrom)
diff --git a/examples/dune b/examples/dune
@@ -0,0 +1,11 @@
+(library
+ (name RFC7159)
+ (wrapped false)
+ (modules RFC7159)
+ (libraries angstrom))
+
+(library
+ (name RFC2616)
+ (wrapped false)
+ (modules RFC2616)
+ (libraries angstrom))
diff --git a/examples/jbuild b/examples/jbuild
diff --git a/lib/dune b/lib/dune
@@ -0,0 +1,5 @@
+(library
+ (name angstrom)
+ (public_name angstrom)
+ (libraries bigstringaf)
+ (flags :standard -safe-string))
diff --git a/lib/jbuild b/lib/jbuild
diff --git a/lib_test/dune b/lib_test/dune
@@ -0,0 +1,12 @@
+(executables
+ (libraries alcotest angstrom)
+ (modules test_angstrom)
+ (names test_angstrom))
+
+(alias
+ (name runtest)
+ (package angstrom)
+ (deps
+  (:< test_angstrom.exe))
+ (action
+  (run %{<})))
diff --git a/lib_test/jbuild b/lib_test/jbuild
diff --git a/lwt/dune b/lwt/dune
@@ -0,0 +1,5 @@
+(library
+ (name angstrom_lwt_unix)
+ (public_name angstrom-lwt-unix)
+ (flags :standard -safe-string)
+ (libraries angstrom lwt.unix))
diff --git a/lwt/jbuild b/lwt/jbuild
diff --git a/unix/dune b/unix/dune
@@ -0,0 +1,4 @@
+(library
+ (name angstrom_unix)
+ (public_name angstrom-unix)
+ (libraries angstrom unix))
diff --git a/unix/jbuild b/unix/jbuild