Use dune + repo cleanup.

.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+on:
+  pull_request:
+  push:
+  workflow_dispatch:
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        ocaml-version: [
+          3.12.1 4.00.1 4.01.0 4.02.0 4.02.1 4.02.2 4.02.3 4.03.0 4.04.0
+          4.04.1 4.04.2 4.05.0 4.06.0 4.06.1 4.07.0 4.07.1 4.08.0 4.08.1
+          4.09.0 4.09.1 4.10.0 4.10.1 4.10.2 4.11.0 4.11.1 4.11.2 4.12.0
+        ]
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: "Checking out the repo..."
+        uses: actions/checkout@v2
+      - name: "Recovering cached opam files..."
+        uses: actions/cache@v2
+        with:
+          path: ~/.opam
+          key: ${{ runner.os }}-ocaml-${{ matrix.ocaml-version }}
+      - name: "Setting up opam..."
+        uses: avsm/setup-ocaml@v1
+        with:
+          ocaml-version: ${{ matrix.ocaml-version }}
+      - name: "Installing dependencies..."
+        run: |
+          eval $(opam env)
+          opam update
+          opam upgrade
+          opam pin add -n -k path bindlib .
+          opam install --deps-only -d -t bindlib
+      - name: "Running tests..."
+        run: |
+          eval $(opam env)
+          make tests

.gitignore

@@ -1,3 +1,4 @@
+.merlin
 *~
 META
 _build/

Makefile

@@ -0,0 +1,48 @@
+VERSION := 5.1.0
+
+all:
+	@dune build
+.PHONY: all
+
+doc:
+	@dune build @doc
+.PHONY: doc
+
+clean:
+	@dune clean
+.PHONY: clean
+
+distclean: clean
+	@find . -name "*~" -type f -exec rm {} \;
+.PHONY: distclean
+
+tests:
+	@dune runtest
+.PHONY: tests
+
+promote:
+	@dune promote
+.PHONY: promote
+
+install:
+	@dune install
+.PHONY: install
+
+uninstall:
+	@dune uninstall
+.PHONY: uninstall
+
+## Documentation webpage
+
+updatedoc: doc
+	@rm -rf docs/odoc
+	@cp -r _build/default/_doc/_html docs/odoc
+.PHONY: updatedoc
+
+## Release
+
+release: distclean
+	git push origin
+	git tag -a ocaml-bindlib_$(VERSION)
+	git push origin ocaml-bindlib_$(VERSION)
+.PHONY: release

bindlib.opam

@@ -1,27 +1,28 @@
+synopsis: "OCaml Bindlib library for bound variables"
+description:
+"""
+Bindlib is a library allowing the manipulation of data structures
+with bound variables. It is particularly useful when writing ASTs
+for programming languages, but also for manipulating terms of the
+λ-calculus or quantified formulas.
+"""
+
 opam-version: "2.0"
-maintainer:   "Rodolphe Lepigre <rodolphe.lepigre@inria.fr>"
-bug-reports:  "https://github.com/rlepigre/ocaml-bindlib/issues"
-authors:
-  [ "Christophe Raffalli <christophe@raffalli.eu>"
-    "Rodolphe Lepigre <rodolphe.lepigre@inria.fr>" ]
+maintainer: "Rodolphe Lepigre <lepigre@mpi-sws.org>"
+bug-reports: "https://github.com/rlepigre/ocaml-bindlib/issues"
 homepage: "https://rlepigre.github.io/ocaml-bindlib/"
+authors: [
+  "Christophe Raffalli <christophe@raffalli.eu>"
+  "Rodolphe Lepigre <lepigre@mpi-sws.org>" ]
 license: "LGPL-3.0"
 dev-repo: "git+https://github.com/rlepigre/ocaml-bindlib.git"
-build: [make]
-install: [make "install"]
-remove: [make "uninstall"]
+
 depends: [
-  "ocaml" {>= "3.12.1"}
-  "ocamlbuild" {build}
-  "ocamlfind" {build}
+  "ocaml" { >= "3.12.1" }
+  "dune"  { >= "2.7.0" }
 ]
-synopsis: "OCaml Bindlib library for bound variables"
-description: """
-Bindlib is a library allowing the manipulation of data structures
-with bound variables. It is particularly useful when writing ASTs
-for programming languages, but also for manipulating terms of the
-λ-calculus or quantified formulas.
 
-Authors:
- - Christophe Raffalli <christophe@raffalli.eu>
- - Rodolphe Lepigre <rodolphe.lepigre@inria.fr>"""
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+]

docs/index.html

@@ -31,7 +31,7 @@ <h3>Ressources:</h3>
 <ul>
   <li>Our LFMTP 2018 <a href="http://eptcs.web.cse.unsw.edu.au/paper.cgi?LFMTP2018.4">introductory paper</a>.</li>
   <li>Our <a href="https://github.com/rlepigre/ocaml-bindlib">GitHub</a> repository.</li>
-  <li>The <a href="ocamldoc/Bindlib.html">ocamldoc documentation</a> of Bindlib.</li>
+  <li>The <a href="odoc/bindlib/Bindlib/index.html">generated documentation</a> of Bindlib.</li>
 </ul>
 
 <a href="https://github.com/rlepigre/ocaml-bindlib"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>