Switched to dune, dune-release, and OPAM 2.0

mmottl · Oct 25, 2018 · 8c5373a · 8c5373a
1 parent 9305e57
commit 8c5373a
Show file tree

Hide file tree

Showing 61 changed files with 117 additions and 302 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+### 11.0.2 (2018-10-24)
+
+  * Switched to dune, dune-release, and OPAM 2.0
+
+
 ### 11.0.1 (2018-05-23)
 
   * Fixed warnings and errors in configuration code due to upstream changes.

diff --git a/Makefile b/Makefile
@@ -1,10 +1,10 @@
 .PHONY: all clean doc
 
 all:
-	jbuilder build @install --dev
+	dune build @install
 
 clean:
-	jbuilder clean
+	dune clean
 
 doc:
-	jbuilder build --dev @doc
+	dune build @doc
diff --git a/dune b/dune
@@ -0,0 +1,4 @@
+(env
+  (dev (flags (:standard -w -9 -principal)))
+  (release (ocamlopt_flags (:standard -O3)))
+)
diff --git a/dune-project b/dune-project
@@ -0,0 +1,2 @@
+(lang dune 1.1)
+(name lacaml)
diff --git a/examples/Makefile b/examples/Makefile
@@ -0,0 +1,10 @@
+EXAMPLES = $(wildcard *.ml)
+TARGETS = $(patsubst %.ml, %.bc, $(EXAMPLES))
+
+.PHONY: all clean
+
+all:
+	@dune build $(TARGETS)
+
+clean:
+	@dune clean
diff --git a/examples/blas/blas.ml → examples/blas.ml b/examples/blas/blas.ml → examples/blas.ml
diff --git a/examples/blas/Makefile b/examples/blas/Makefile
diff --git a/examples/blas/jbuild b/examples/blas/jbuild
diff --git a/examples/dune b/examples/dune
@@ -0,0 +1,27 @@
+(executables
+  (names
+    blas
+    eig
+    gbsv
+    lin_eq
+    lin_eq_comp
+    lin_reg
+    nag_gbsv
+    nag_gesv
+    nag_gtsv
+    nag_pbsv
+    nag_posv
+    nag_ppsv
+    nag_ptsv
+    nag_spsv
+    nag_sysv
+    qr
+    sbev
+    sbgv
+    schur_complex
+    schur_real
+    shuffle
+    svd
+  )
+  (libraries lacaml)
+)
diff --git a/examples/eig/eig.ml → examples/eig.ml b/examples/eig/eig.ml → examples/eig.ml
diff --git a/examples/eig/Makefile b/examples/eig/Makefile
diff --git a/examples/eig/jbuild b/examples/eig/jbuild
diff --git a/examples/lin_eq/gbsv.ml → examples/gbsv.ml b/examples/lin_eq/gbsv.ml → examples/gbsv.ml
@@ -45,5 +45,4 @@ let () =
   let res = Vec.sub (gbmv ab kl ku ~ar:(kl + row) sol) b in
   printf "@[<2>Solving general band matrix:@\n@\n";
   printf "Sol: X  = @[%a@]@\n" pp_rfvec sol;
-  printf "A X - b = %a@]@\n@\n" pp_rfvec res;
-
+  printf "A X - b = %a@]@\n@\n" pp_rfvec res
diff --git a/examples/lin_eq/lin_eq.ml → examples/lin_eq.ml b/examples/lin_eq/lin_eq.ml → examples/lin_eq.ml
diff --git a/examples/lin_eq/Makefile b/examples/lin_eq/Makefile
diff --git a/examples/lin_eq/jbuild b/examples/lin_eq/jbuild
diff --git a/examples/lin_eq_comp/lin_eq_comp.ml → examples/lin_eq_comp.ml b/examples/lin_eq_comp/lin_eq_comp.ml → examples/lin_eq_comp.ml
diff --git a/examples/lin_eq_comp/Makefile b/examples/lin_eq_comp/Makefile
diff --git a/examples/lin_eq_comp/jbuild b/examples/lin_eq_comp/jbuild
diff --git a/examples/lin_reg/lin_reg.ml → examples/lin_reg.ml b/examples/lin_reg/lin_reg.ml → examples/lin_reg.ml
diff --git a/examples/lin_reg/Makefile b/examples/lin_reg/Makefile
diff --git a/examples/lin_reg/jbuild b/examples/lin_reg/jbuild
diff --git a/examples/nag/Makefile b/examples/nag/Makefile
diff --git a/examples/nag/jbuild b/examples/nag/jbuild
diff --git a/examples/nag/nag_gbsv.ml → examples/nag_gbsv.ml b/examples/nag/nag_gbsv.ml → examples/nag_gbsv.ml
diff --git a/examples/nag/nag_gesv.ml → examples/nag_gesv.ml b/examples/nag/nag_gesv.ml → examples/nag_gesv.ml
diff --git a/examples/nag/nag_gtsv.ml → examples/nag_gtsv.ml b/examples/nag/nag_gtsv.ml → examples/nag_gtsv.ml
@@ -36,5 +36,4 @@ let b= Vec.of_array [| 2.7; -0.5;  2.6;  0.6;  2.7 |]
 let () =
   let x = copy b in
   gtsv dl d du (Mat.from_col_vec x);
-  printf "Solution: X = @[%a@]@\n" pp_rfvec x;
-
+  printf "Solution: X = @[%a@]@\n" pp_rfvec x
diff --git a/examples/nag/nag_pbsv.ml → examples/nag_pbsv.ml b/examples/nag/nag_pbsv.ml → examples/nag_pbsv.ml
diff --git a/examples/nag/nag_posv.ml → examples/nag_posv.ml b/examples/nag/nag_posv.ml → examples/nag_posv.ml
diff --git a/examples/nag/nag_ppsv.ml → examples/nag_ppsv.ml b/examples/nag/nag_ppsv.ml → examples/nag_ppsv.ml
diff --git a/examples/nag/nag_ptsv.ml → examples/nag_ptsv.ml b/examples/nag/nag_ptsv.ml → examples/nag_ptsv.ml
@@ -39,4 +39,3 @@ let () =
   printf "Solution: X = @[%a@]@\n" pp_rfvec x;
   printf "Diagonal elements of the diagonal matrix D: @[%a@]@\n" pp_rfvec d;
   printf "Sub-diagonal elements of the Cholesky factor L: @[%a@]@\n" pp_rfvec e
-
diff --git a/examples/nag/nag_spsv.ml → examples/nag_spsv.ml b/examples/nag/nag_spsv.ml → examples/nag_spsv.ml
@@ -54,4 +54,3 @@ let () =
   pp_float_el_default := (fun fm x -> if (x: float) = x then fprintf fm "%G" x);
   printf "Details of the factorization: @[%a@]@\n" pp_fmat a;
   printf "Pivot indices: @[%a@]@\n" pp_rivec ipiv
-
diff --git a/examples/nag/nag_sysv.ml → examples/nag_sysv.ml b/examples/nag/nag_sysv.ml → examples/nag_sysv.ml
diff --git a/examples/qr/qr.ml → examples/qr.ml b/examples/qr/qr.ml → examples/qr.ml
diff --git a/examples/qr/Makefile b/examples/qr/Makefile
diff --git a/examples/qr/jbuild b/examples/qr/jbuild
diff --git a/examples/run_examples.sh b/examples/run_examples.sh
@@ -2,14 +2,11 @@
 
 set -e
 
-for dir in `find . -mindepth 1 -maxdepth 1 -type d`; do
-  cd $dir
-  for file in *.ml; do
-    ex=`basename $file .ml`
-    exexec=$ex.exe
-    echo TESTING $dir/$ex ==================================================
-    jbuilder build $exexec
-    ../../_build/default/examples/$dir/$exexec
-  done
-  cd ..
+dune build `echo *.ml | sed -e 's/.ml/.exe/g'`
+
+for file in *.ml; do
+  ex=`basename $file .ml`
+  exexec=$ex.exe
+  echo TESTING $dir/$ex ==================================================
+  ../_build/default/examples/$dir/$exexec
 done
diff --git a/examples/eig/sbev.ml → examples/sbev.ml b/examples/eig/sbev.ml → examples/sbev.ml
diff --git a/examples/eig/sbgv.ml → examples/sbgv.ml b/examples/eig/sbgv.ml → examples/sbgv.ml
diff --git a/examples/schur/Makefile b/examples/schur/Makefile
diff --git a/examples/schur/jbuild b/examples/schur/jbuild
diff --git a/examples/schur/schur_complex.ml → examples/schur_complex.ml b/examples/schur/schur_complex.ml → examples/schur_complex.ml
diff --git a/examples/schur/schur_real.ml → examples/schur_real.ml b/examples/schur/schur_real.ml → examples/schur_real.ml
diff --git a/examples/shuffle/shuffle.ml → examples/shuffle.ml b/examples/shuffle/shuffle.ml → examples/shuffle.ml
diff --git a/examples/shuffle/Makefile b/examples/shuffle/Makefile
diff --git a/examples/shuffle/jbuild b/examples/shuffle/jbuild
diff --git a/examples/svd/svd.ml → examples/svd.ml b/examples/svd/svd.ml → examples/svd.ml
diff --git a/examples/svd/Makefile b/examples/svd/Makefile
diff --git a/examples/svd/jbuild b/examples/svd/jbuild
diff --git a/jbuild-workspace b/jbuild-workspace
diff --git a/lacaml.descr b/lacaml.descr
diff --git a/lacaml.opam b/lacaml.opam
@@ -22,18 +22,24 @@ bug-reports: "https://github.com/mmottl/lacaml/issues"
 tags: [ "clib:lapack" "clib:blas" ]
 
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 
 depends: [
   "ocaml" {>= "4.05"}
+  "dune" {build & >= "1.4.0"}
   "conf-blas" {build}
   "conf-lapack" {build}
   "base" {build}
   "stdio" {build}
-  "configurator" {build}
-  "jbuilder" {build & >= "1.0+beta13"}
   "base-bytes"
   "base-bigarray"
 ]
+
+synopsis: "Lacaml - OCaml-bindings to BLAS and LAPACK"
+
+description: """
+Lacaml interfaces the BLAS-library (Basic Linear Algebra Subroutines) and
+LAPACK-library (Linear Algebra routines).  It also contains many additional
+convenience functions for vectors and matrices."""
diff --git a/src/Makefile b/src/Makefile
@@ -3,7 +3,7 @@ TARGETS = lacaml.cma liblacaml_stubs.a
 .PHONY: all clean
 
 all:
-	@jbuilder build --dev $(TARGETS)
+	@dune build $(TARGETS)
 
 clean:
-	@jbuilder clean
+	@dune clean
diff --git a/src/config/Makefile b/src/config/Makefile
@@ -1,10 +1,9 @@
 TARGETS = discover.bc make_prec_dep.bc
-JBUILDER_ROOT = ../..
 
 .PHONY: all clean
 
 all:
-	@jbuilder build --dev $(TARGETS)
+	@dune build $(TARGETS)
 
 clean:
-	@jbuilder clean
+	@dune clean