Merge pull request #76 from anmonteiro/anmonteiro/switch-to-dune

Switch to Dune

Makefile

@@ -1,18 +1,18 @@
 .PHONY: all build clean test
 
 build:
-	jbuilder build --dev @install
+	dune build @install
 
 all: build
 
 test:
-	jbuilder runtest --dev
+	dune runtest
 
 install:
-	jbuilder install
+	dune install
 
 uninstall:
-	jbuilder uninstall
+	dune uninstall
 
 clean:
 	rm -rf _build *.install

README.md

@@ -62,10 +62,10 @@ opam install --deps-only httpaf
 After this, you may install a development version of the library using the
 install command as usual.
 
-Tests can be run via jbuilder:
+Tests can be run via dune:
 
 ```bash
-jbuilder runtest
+dune runtest
 ```
 
 ## License

async/dune

@@ -0,0 +1,7 @@
+(library
+ (name        httpaf_async)
+ (public_name httpaf-async)
+ (wrapped false)
+ (libraries
+   async core angstrom-async faraday-async httpaf)
+ (flags (:standard -safe-string)))

benchmarks/dune

@@ -0,0 +1,10 @@
+(executable
+ (libraries httpaf httpaf-async async core)
+ (modules wrk_async_benchmark)
+ (name wrk_async_benchmark)
+ (flags (:standard -w -9)))
+
+(executable
+ (name wrk_lwt_benchmark)
+ (modules Wrk_lwt_benchmark)
+ (libraries httpaf httpaf-lwt lwt.unix))

benchmarks/wrk_async_benchmark.ml

@@ -8,7 +8,7 @@ let text = "CHAPTER I. Down the Rabbit-Hole  Alice was beginning to get very tir
 let text = Bigstring.of_string text
 
 let headers = Headers.of_list ["content-length", string_of_int (Bigstring.length text)]
-let error_handler _ ?request error start_response =
+let error_handler _ ?request:_ error start_response =
   let response_body = start_response Headers.empty in
   begin match error with
   | `Exn exn ->

benchmarks/wrk_lwt_benchmark.ml

@@ -56,7 +56,7 @@ let connection_handler =
         reqd (Response.create `Not_found) "Route not found"
   in
 
-  let error_handler _ ?request error start_response =
+  let error_handler _ ?request:_ error start_response =
     let response_body = start_response Headers.empty in
 
     begin match error with

dune-project

@@ -0,0 +1,3 @@
+(lang dune 1.5)
+
+(name httpaf)

examples/async/async_echo_post.ml

@@ -5,7 +5,7 @@ open Httpaf
 open Httpaf_async
 
 
-let error_handler _ ?request error start_response =
+let error_handler _ ?request:_ error start_response =
   let response_body = start_response Headers.empty in
   begin match error with
   | `Exn exn ->
@@ -46,7 +46,7 @@ let main port max_accepts_per_batch () =
   Tcp.(Server.create_sock ~on_handler_error:`Raise
       ~backlog:10_000 ~max_connections:10_000 ~max_accepts_per_batch where_to_listen)
     (Server.create_connection_handler ~request_handler ~error_handler)
-  >>= fun server ->
+  >>= fun _server ->
   Deferred.never ()
 
 let () =

examples/async/dune

@@ -0,0 +1,5 @@
+(executables
+ (libraries httpaf httpaf-async async core)
+ (modules async_echo_post async_get async_post)
+ (names async_echo_post async_get async_post)
+ (flags (:standard -w -9)))

examples/lwt/dune

@@ -0,0 +1,3 @@
+(executables
+ (names lwt_get lwt_post lwt_echo_server)
+ (libraries httpaf httpaf-lwt lwt lwt.unix))

httpaf-async.opam

@@ -7,13 +7,13 @@ homepage: "https://github.com/inhabitedtype/httpaf"
 bug-reports: "https://github.com/inhabitedtype/httpaf/issues"
 dev-repo: "git+https://github.com/inhabitedtype/httpaf.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] {with-test}
 ]
 depends: [
   "ocaml" {>= "4.03.0"}
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build}
   "angstrom-async" {>= "0.9.0"}
   "faraday-async"
   "async"

httpaf-lwt.opam

@@ -7,14 +7,14 @@ homepage: "https://github.com/inhabitedtype/httpaf"
 bug-reports: "https://github.com/inhabitedtype/httpaf/issues"
 dev-repo: "git+https://github.com/inhabitedtype/httpaf.git"
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
   "ocaml" {>= "4.03.0"}
   "faraday-lwt-unix"
   "httpaf"
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build}
   "lwt"
 ]
 synopsis: "Lwt support for http/af"

httpaf.opam

@@ -6,13 +6,13 @@ homepage: "https://github.com/inhabitedtype/httpaf"
 bug-reports: "https://github.com/inhabitedtype/httpaf/issues"
 dev-repo: "git+https://github.com/inhabitedtype/httpaf.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] {with-test}
 ]
 depends: [
   "ocaml" {>= "4.03.0"}
-  "jbuilder" {build & >= "1.0+beta10"}
+  "dune" {build}
   "alcotest" {with-test}
   "angstrom" {>= "0.9.0"}
   "faraday" {>= "0.5.0"}

lib/dune

@@ -0,0 +1,6 @@
+(library
+ (name        httpaf)
+ (public_name httpaf)
+ (libraries
+   angstrom faraday bigstringaf result)
+ (flags (:standard -safe-string)))

lib_test/dune

@@ -0,0 +1,22 @@
+(executables
+ (libraries bigstringaf httpaf alcotest)
+ (modules test_httpaf test_httpaf_server test_httpaf_client simulator)
+ (names   test_httpaf test_httpaf_server test_httpaf_client))
+
+(alias
+ (name runtest)
+ (package httpaf)
+ (deps test_httpaf.exe)
+ (action (run %{deps})))
+
+(alias
+ (name runtest)
+ (package httpaf)
+ (deps test_httpaf_server.exe)
+ (action (run %{deps})))
+
+(alias
+ (name runtest)
+ (package httpaf)
+ (deps test_httpaf_client.exe)
+ (action (run %{deps})))

lwt/dune

@@ -0,0 +1,5 @@
+(library
+ (name httpaf_lwt)
+ (public_name httpaf-lwt)
+ (libraries faraday-lwt-unix httpaf lwt.unix)
+ (flags (:standard -safe-string)))