Just a 'bureaucratic' update (jbuilder -> dune, opam -> opam 2.0)

Makefile

@@ -1,6 +1,6 @@
 .PHONY : run
 run :
-	jbuilder build --dev tester/tester.exe reporter/reporter.exe
+	dune build tester/tester.exe reporter/reporter.exe
 	mkdir -p _report
 	_build/default/tester/tester.exe -ascii -quota 10 > _report/core_bench.txt
 	_build/default/reporter/reporter.exe \
@@ -9,15 +9,15 @@ run :
 
 .PHONY : test-correctness
 test-correctness :
-	jbuilder build --dev correctness/correctness.exe
+	dune build correctness/correctness.exe
 	_build/default/correctness/correctness.exe
 
 MEMORY_TESTS := $(shell ls memory/*/test.ml)
 MEMORY_TESTS := $(MEMORY_TESTS:.ml=.exe)
 
 .PHONY : compare-memory-usage
 compare-memory-usage :
-	jbuilder build --dev $(MEMORY_TESTS)
+	dune build $(MEMORY_TESTS)
 	@echo "map             stack   heap    total"
 	@for TEST in $(MEMORY_TESTS) ; \
 	do \
@@ -32,5 +32,5 @@ depend :
 
 .PHONY : clean
 clean :
-	jbuilder clean
+	dune clean
 	rm -rf _report

correctness/dune

@@ -0,0 +1,4 @@
+(executable
+ (name correctness)
+ (flags :standard -w +A)
+ (libraries faster-map.functions))

dune-project

@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name faster-map)

faster-map.opam

@@ -1,9 +1,14 @@
-opam-version: "1.2"
+opam-version: "2.0"
+synopsis: "A tail-recursive list map with good performance for all list sizes. Not actually written in assembly"
+authors: "Anton Bachin <[email protected]>"
+maintainer: "Anton Bachin <[email protected]>"
+homepage: "https://github.com/aantron/faster-map"
+bug-reports: "https://github.com/aantron/faster-map/issues"
 
 depends: [
   "base"
   "batteries"
   "containers"
   "core_bench"
-  "jbuilder" {build & >= "1.0+beta13"}
+  "dune"
 ]

functions/dune

@@ -0,0 +1,18 @@
+; Example output of the generator can be found in results/faster_map.ml. That is
+; basically a dumped and commented generated.ml.
+
+(rule
+ (targets generated.ml)
+ (deps
+  (:< %{workspace_root}/generator/generator.exe))
+ (action
+  (with-stdout-to
+   %{targets}
+   (run %{<}))))
+
+(library
+ (name functions)
+ (public_name faster-map.functions)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3)
+ (libraries base batteries containers))

generator/dune

@@ -0,0 +1,3 @@
+(executable
+ (name generator)
+ (flags :standard -w +A))

memory/base/dune

@@ -0,0 +1,5 @@
+(executable
+ (name test)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3)
+ (libraries faster-map.instrumented))

memory/batteries/dune

@@ -0,0 +1,5 @@
+(executable
+ (name test)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3)
+ (libraries faster-map.instrumented))

memory/containers/dune

@@ -0,0 +1,5 @@
+(executable
+ (name test)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3)
+ (libraries faster-map.instrumented))

memory/dune

@@ -0,0 +1,5 @@
+(library
+ (name instrumented)
+ (public_name faster-map.instrumented)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3))

memory/naive/dune

@@ -0,0 +1,5 @@
+(executable
+ (name test)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3)
+ (libraries faster-map.instrumented))

memory/proposed/dune

@@ -0,0 +1,5 @@
+(executable
+ (name test)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3)
+ (libraries faster-map.instrumented))

memory/stdlib/dune

@@ -0,0 +1,5 @@
+(executable
+ (name test)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3)
+ (libraries faster-map.instrumented))

memory/unrolled/dune

@@ -0,0 +1,5 @@
+(executable
+ (name test)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3)
+ (libraries faster-map.instrumented))

reporter/dune

@@ -0,0 +1,3 @@
+(executable
+ (name reporter)
+ (flags :standard -w +A))

tester/dune

@@ -0,0 +1,5 @@
+(executable
+ (name tester)
+ (flags :standard -w +A)
+ (ocamlopt_flags :standard -O3)
+ (libraries core_bench faster-map.functions))