switch to dune

.gitignore

@@ -2,3 +2,5 @@ _build
 setup.data
 setup.log
 summary.native
+*.merlin
+*.install

README.md

@@ -1,4 +1,3 @@
-
 [![Build Status](https://travis-ci.org/lindig/bisect-summary.svg?branch=master)](https://travis-ci.org/lindig/bisect-summary)
 
 # Bisect Summary
@@ -32,9 +31,9 @@ If you prefer the latest version, you can pin this repository:
 
 If you like to work on the code directly without installing it via Opam:
 
-    $ opam install oasis
+    $ opam install dune
     $ opam install bisect_ppx
-    $ make
+    $ dune build @install
 
 # Usage
 

bisect-summary.opam

@@ -0,0 +1,21 @@
+opam-version   : "2.0"
+maintainer     : "Christian Lindig <[email protected]>"
+authors        : ["Christian Lindig <[email protected]>"]
+license        : "MIT"
+homepage       : "https://github.com/lindig/bisect-summary"
+bug-reports    : "https://github.com/lindig/bisect-summary/issues"
+dev-repo       : "git://github.com/lindig/bisect-summary.git"
+synopsis       : "Simple analysis of coverage data created by bisect-ppx"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "bisect_ppx"
+  "dune" {build & >= "1.11.0"}
+]
+description: """bisect-summary - simple analysis of coverage data created by bisect-ppx
+
+This tool reads the data produced by bisect-ppx-instrumented code at
+runtime and reports the coverate ratio. Unlike bisect-ppx-report, it
+doesn't require access to the source code of the instrumented code and
+the *.pmx files that bisect-ppx created at instrumentation time."""

dune-project

@@ -0,0 +1,3 @@
+(lang dune 1.11)
+(name bisect-summary)
+(explicit_js_mode)

src/dune

@@ -0,0 +1,3 @@
+(executable
+  (name summary)
+  (libraries unix bisect_ppx))

src/summary.ml

@@ -10,7 +10,7 @@
  * ocamlbuild -use-ocamlfind -pkg bisect_ppx summary.native
  *)
 
-module B  = Bisect.Common
+[@@@ocaml.warning "-3"]
 
 (* these are the types used by [bisect_ppx] *)
 type file     = string
@@ -53,7 +53,7 @@ let merge
     | rx, [] -> rx
     | (fx, px)::rx, (fy, py)::ry          when fx = fy ->
       (fx, add px py) :: loop rx ry
-    | (fx, px)::rx, ((fy, py)::ry as yy)  when fx < fy ->
+    | (fx, px)::rx, ((fy, _)::_ as yy)  when fx < fy ->
       (fx, px) :: loop rx yy
     | xx, (fy, py)::ry ->                 (*   fx > fy *)
       (fy, py) :: loop xx ry
@@ -66,15 +66,15 @@ let read
   : string list -> runtime
   = fun files ->
   files
-  |> List.map B.read_runtime_data
+  |> List.map Bisect.Common.read_runtime_data
   |> List.fold_left merge []
 
 (** [popcount array] returns the number of non-zero entries in an array
  * *)
 let popcount counters =
   let add pop = function
     | 0 -> pop
-    | n -> pop + 1
+    | _ -> pop + 1
   in
     Array.fold_left add 0 counters
 
@@ -88,7 +88,7 @@ let report
   let nonzero = popcount counters in
   let ratio = match total with
     | 0 -> 0.0
-    | n -> 100.0 *. float_of_int nonzero /. float_of_int total
+    | _ -> 100.0 *. float_of_int nonzero /. float_of_int total
   in
     Printf.printf "%5.1f%% [%4d/%-4d] %s\n" ratio nonzero total name
 
@@ -114,8 +114,8 @@ let main () =
 let init name =
   let (//)    = Filename.concat in
   let tmpdir  = Filename.get_temp_dir_name () in
-    try 
-      ignore (Sys.getenv "BISECT_FILE") 
+    try
+      ignore (Sys.getenv "BISECT_FILE")
     with Not_found ->
       Unix.putenv "BISECT_FILE" (tmpdir // Printf.sprintf "bisect-%s-" name)