From 85fd4baf695c572d0e371f66b109e204d9f8eeaa Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Fri, 12 Oct 2018 18:11:26 -0500 Subject: [PATCH] chore: migrate to dune and opam2 --- Makefile | 15 ++++++--------- dune-project | 1 + qtest/dune | 22 ++++++++++++++++++++++ qtest/jbuild | 21 --------------------- sequence.opam | 24 +++++++++++------------- src/bigarray/SequenceBigarray.ml | 1 + src/bigarray/dune | 10 ++++++++++ src/bigarray/jbuild | 10 ---------- src/dune | 18 ++++++++++++++++++ src/jbuild | 18 ------------------ 10 files changed, 69 insertions(+), 71 deletions(-) create mode 100644 dune-project create mode 100644 qtest/dune delete mode 100644 qtest/jbuild create mode 100644 src/bigarray/dune delete mode 100644 src/bigarray/jbuild create mode 100644 src/dune delete mode 100644 src/jbuild diff --git a/Makefile b/Makefile index 095d507..6245086 100644 --- a/Makefile +++ b/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 - -push_doc: all doc - scp -r sequence.docdir/* cedeela.fr:~/simon/root/software/sequence/ + dune build examples/test_sexpr.exe VERSION=$(shell awk '/^version:/ {print $$2}' sequence.opam) diff --git a/dune-project b/dune-project new file mode 100644 index 0000000..de4fc20 --- /dev/null +++ b/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/qtest/dune b/qtest/dune new file mode 100644 index 0000000..2e4267d --- /dev/null +++ b/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})) + ) + diff --git a/qtest/jbuild b/qtest/jbuild deleted file mode 100644 index ad96b55..0000000 --- a/qtest/jbuild +++ /dev/null @@ -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 ${<})) - )) - diff --git a/sequence.opam b/sequence.opam index 5c5feaf..62ec217 100644 --- a/sequence.opam +++ b/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"] -] -build-doc: [ - [make "doc"] -] -build-test: [ - [make "test"] + ["dune" "build" "@install" "-p" name "-j" jobs] + ["dune" "build" "@doc" "-p" name] {with-doc} + ["dune" "runtest" "-p" name] {with-test} ] depends: [ "base-bytes" "result" - "jbuilder" {build} - "qcheck" {test} - "qtest" {test} - "odoc" {doc} + "dune" {build} + "qcheck" {with-test} + "qtest" {with-test} + "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" diff --git a/src/bigarray/SequenceBigarray.ml b/src/bigarray/SequenceBigarray.ml index b52e460..03d8697 100644 --- a/src/bigarray/SequenceBigarray.ml +++ b/src/bigarray/SequenceBigarray.ml @@ -23,3 +23,4 @@ let mmap filename = with e -> Unix.close fd; raise e +[@@ocaml.warning "-3"] diff --git a/src/bigarray/dune b/src/bigarray/dune new file mode 100644 index 0000000..2c7bf70 --- /dev/null +++ b/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)) + ) diff --git a/src/bigarray/jbuild b/src/bigarray/jbuild deleted file mode 100644 index f44100a..0000000 --- a/src/bigarray/jbuild +++ /dev/null @@ -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))) - )) diff --git a/src/dune b/src/dune new file mode 100644 index 0000000..25c3ab1 --- /dev/null +++ b/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) + ) + diff --git a/src/jbuild b/src/jbuild deleted file mode 100644 index c20d7d9..0000000 --- a/src/jbuild +++ /dev/null @@ -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)) - )) -