chore: migrate to dune and opam2

Makefile

@@ -2,27 +2,24 @@
 all: build test
 
 build:
-	jbuilder build @install
+	@dune build @install
 
 test:
-	jbuilder runtest --no-buffer --force
+	@dune runtest --no-buffer --force
 
 clean:
-	jbuilder clean
+	@dune clean
 
 doc:
-	jbuilder build @doc
+	@dune build @doc
 
 BENCH_TARGETS=bench_persistent_read.exe bench_persistent.exe
 
 benchs:
-	jbuilder build $(addprefix bench/, $(BENCH_TARGETS))
+	dune build $(addprefix bench/, $(BENCH_TARGETS))
 
 examples:
-	jbuilder build examples/test_sexpr.exe
+	dune build examples/test_sexpr.exe
-
-push_doc: all doc
-	scp -r sequence.docdir/* cedeela.fr:~/simon/root/software/sequence/
 
 VERSION=$(shell awk '/^version:/ {print $$2}' sequence.opam)
 

dune-project

@@ -0,0 +1 @@
+(lang dune 1.0)

qtest/dune

@@ -0,0 +1,22 @@
+
+(rule
+  (targets run_qtest.ml)
+  (deps Makefile (source_tree ../src)) ; (glob_files ../src/**/*.ml{,i})))
+  (mode fallback)
+  ;(libraries (qtest qcheck))
+  (action
+    (run make qtest-gen))
+  )
+
+(executable
+  (name run_qtest)
+  (flags :standard -warn-error -a+8 -safe-string -w -33)
+  (libraries sequence qcheck)
+  )
+
+(alias
+ (name    runtest)
+ (deps    run_qtest.exe)
+ (action  (run %{deps}))
+ )
+

qtest/jbuild

@@ -1,21 +0,0 @@
-
-(rule
-  ((targets (run_qtest.ml))
-   (deps ((file Makefile) (files_recursively_in ../src))) ; (glob_files ../src/**/*.ml{,i})))
-   (fallback)
-   ;(libraries (qtest qcheck))
-   (action
-     (run make qtest-gen))
-  ))
-
-(executable
-  ((name run_qtest)
-   (libraries (sequence qcheck))
-  ))
-
-(alias
- ((name    runtest)
-  (deps    (run_qtest.exe))
-  (action  (run ${<}))
-  ))
-

sequence.opam

@@ -1,25 +1,23 @@
-opam-version: "1.2"
+opam-version: "2.0"
 name: "sequence"
 version: "1.1"
 author: "Simon Cruanes"
 maintainer: "simon.cruanes.2007@m4x.org"
 license: "BSD-2-clauses"
+synopsis: "Simple sequence abstract datatype, intended to iterate efficiently
+on collections while performing some transformations"
 build: [
-    [make "build"]
+  ["dune" "build" "@install" "-p" name "-j" jobs]
-]
+  ["dune" "build" "@doc" "-p" name] {with-doc}
-build-doc: [
+  ["dune" "runtest" "-p" name] {with-test}
-  [make "doc"]
-]
-build-test: [
-  [make "test"]
 ]
 depends: [
   "base-bytes"
   "result"
-  "jbuilder" {build}
+  "dune" {build}
-  "qcheck" {test}
+  "qcheck" {with-test}
-  "qtest" {test}
+  "qtest" {with-test}
-  "odoc" {doc}
+  "odoc" {with-doc}
 ]
 tags: [ "sequence" "iterator" "iter" "fold" ]
 homepage: "https://github.com/c-cube/sequence/"
@@ -28,4 +26,4 @@ depopts: [
 ]
 doc: "https://c-cube.github.io/sequence/"
 bug-reports: "https://github.com/c-cube/sequence/issues"
-dev-repo: "https://github.com/c-cube/sequence.git"
+dev-repo: "git+https://github.com/c-cube/sequence.git"

src/bigarray/SequenceBigarray.ml

@@ -23,3 +23,4 @@ let mmap filename =
     with e ->
       Unix.close fd;
       raise e
+[@@ocaml.warning "-3"]

src/bigarray/dune

@@ -0,0 +1,10 @@
+
+(library
+  (name sequence_bigarray)
+  (public_name sequence.bigarray)
+  (libraries sequence bigarray)
+  (wrapped false)
+  (optional)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
+  (ocamlopt_flags :standard (:include ../flambda.flags))
+  )

src/bigarray/jbuild

@@ -1,10 +0,0 @@
-
-(library
-  ((name sequence_bigarray)
-   (public_name sequence.bigarray)
-   (libraries (sequence bigarray))
-   (wrapped false)
-   (optional)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-  ))

src/dune

@@ -0,0 +1,18 @@
+(rule
+  (targets flambda.flags)
+  (deps mkflags.ml)
+  (mode fallback)
+  (action
+    (run ocaml ./mkflags.ml))
+  )
+
+(library
+  (name sequence)
+  (public_name sequence)
+  (wrapped false)
+  (modules Sequence SequenceLabels)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -nolabels)
+  (ocamlopt_flags :standard (:include flambda.flags))
+  (libraries bytes result)
+  )
+

src/jbuild

@@ -1,18 +0,0 @@
-(rule
-  ((targets (flambda.flags))
-   (deps ((file mkflags.ml)))
-   (fallback)
-   (action
-     (run ocaml ./mkflags.ml))
-  ))
-
-(library
-  ((name sequence)
-   (public_name sequence)
-   (wrapped false)
-   (modules (Sequence SequenceLabels))
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -nolabels))
-   (ocamlopt_flags (:standard (:include flambda.flags)))
-   (libraries (bytes result))
-  ))
-