Switched to dune, dune-release, and OPAM 2.0

Author: mmottl

CHANGES.md

@@ -1,3 +1,8 @@
+### 4.4.1 (2018-10-25)
+
+  * Switched to dune, dune-release, and OPAM 2.0
+
+
 ### 4.4.0 (2018-04-26)
 
   * Support for new open flags:

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

dune

@@ -0,0 +1,4 @@
+(env
+  (dev (flags (:standard -w -9 -principal)))
+  (release (ocamlopt_flags (:standard -O3)))
+)

dune-project

@@ -0,0 +1,2 @@
+(lang dune 1.1)
+(name sqlite3)

jbuild-workspace

@@ -1,4 +1,4 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "Markus Mottl <[email protected]>"
 authors: [
   "Markus Mottl <[email protected]>"
@@ -7,21 +7,26 @@ authors: [
 license: "Expat"
 homepage: "http://mmottl.github.io/sqlite3-ocaml"
 doc: "https://mmottl.github.io/sqlite3-ocaml/api"
-dev-repo: "https://github.com/mmottl/sqlite3-ocaml.git"
+dev-repo: "git+https://github.com/mmottl/sqlite3-ocaml.git"
 bug-reports: "https://github.com/mmottl/sqlite3-ocaml/issues"
 tags: [ "clib:sqlite3" "clib:pthread"  ]
 
 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"}
   "base" {build}
-  "conf-sqlite3" {build}
   "stdio" {build}
-  "configurator" {build}
-  "jbuilder" {build & >= "1.0+beta10"}
+  "conf-sqlite3" {build}
 ]
 
-available: [ ocaml-version >= "4.05" ]
+synopsis: "SQLite3 bindings for OCaml"
+
+description: """
+sqlite3-ocaml is an OCaml library with bindings to the SQLite3 client API.
+Sqlite3 is a self-contained, serverless, zero-configuration, transactional SQL
+database engine with outstanding performance for many use cases."""

sqlite3.descr

@@ -3,7 +3,7 @@ TARGETS = sqlite3.cma libsqlite3_stubs.a
 .PHONY: all clean
 
 all:
-	@jbuilder build --dev $(TARGETS)
+	@dune build $(TARGETS)
 
 clean:
-	@jbuilder clean
+	@dune clean

sqlite3.opam

@@ -1,10 +1,9 @@
 TARGETS = discover.bc
-JBUILDER_ROOT = ../..
 
 .PHONY: all clean
 
 all:
-	@jbuilder build --dev $(TARGETS)
+	@dune build $(TARGETS)
 
 clean:
-	@jbuilder clean
+	@dune clean

src/Makefile

@@ -38,7 +38,7 @@ let pkg_export =
 let split_ws str = List.filter (String.split ~on:' ' str) ~f:(String.(<>) "")
 
 let () =
-  let module C = Configurator in
+  let module C = Configurator.V1 in
   C.main ~name:"sqlite3" (fun c ->
     let is_macosx =
       Option.value_map (C.ocaml_config_var c "system") ~default:false
@@ -64,8 +64,5 @@ let () =
       | _ -> failwith "pkg-config failed to return libs"
     in
     let conf = { C.Pkg_config.cflags; libs } in
-    let write_sexp file sexp =
-      Out_channel.write_all file ~data:(Sexp.to_string sexp)
-    in
-    write_sexp "c_flags.sexp" (sexp_of_list sexp_of_string conf.cflags);
-    write_sexp "c_library_flags.sexp" (sexp_of_list sexp_of_string conf.libs))
+    C.Flags.write_sexp "c_flags.sexp" conf.cflags;
+    C.Flags.write_sexp "c_library_flags.sexp" conf.libs)

src/config/Makefile

@@ -0,0 +1,4 @@
+(executables
+  (names discover)
+  (libraries base stdio dune.configurator)
+)

src/config/discover.ml

@@ -0,0 +1,16 @@
+(library
+  (public_name sqlite3)
+  (c_names sqlite3_stubs)
+  (c_flags (
+    (:include c_flags.sexp) -g -O2 -fPIC -DPIC
+    ; NOTE: for debugging before releases
+    ; -Wall -pedantic -Wextra -Wunused -Wno-long-long -Wno-keyword-macro
+  ))
+  (c_library_flags (:include c_library_flags.sexp) -lpthread)
+)
+
+(rule
+  (targets c_flags.sexp c_library_flags.sexp)
+  (deps (:discover config/discover.exe))
+  (action (run %{discover}))
+)

src/config/dune

@@ -4,7 +4,7 @@ TARGETS = \
 .PHONY: all clean
 
 all:
-	@jbuilder build --dev $(TARGETS)
+	@dune build $(TARGETS)
 
 clean:
-	@jbuilder clean
+	@dune clean

src/config/jbuild

@@ -0,0 +1,4 @@
+(executables
+  (names test_agg test_db test_error test_exec test_fun test_stmt)
+  (libraries str sqlite3)
+)