Switched to dune, dune-release, and OPAM 2.0

mmottl · mmottl · commit 267f74adb69a · 2018-10-25T15:41:15.000-04:00
diff --git a/CHANGES.md b/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-07-08)
 
   * Added support for executing queries with binary results.
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 postgresql)
diff --git a/examples/Makefile b/examples/Makefile
@@ -3,7 +3,7 @@ TARGETS = $(addsuffix .bc, async binary cursor dump populate prompt test_lo)
 .PHONY: all clean
 
 all:
-	@jbuilder build --dev $(TARGETS)
+	@dune build $(TARGETS)
 
 clean:
-	@jbuilder clean
+	@dune clean
diff --git a/examples/dune b/examples/dune
@@ -0,0 +1,4 @@
+(executables
+  (names async binary cursor dump populate prompt test_lo)
+  (libraries postgresql)
+)
diff --git a/examples/jbuild b/examples/jbuild
diff --git a/jbuild-workspace b/jbuild-workspace
diff --git a/postgresql.descr b/postgresql.descr
diff --git a/postgresql.opam b/postgresql.opam
@@ -1,4 +1,4 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "Markus Mottl <markus.mottl@gmail.com>"
 authors: [
   "Alain Frisch <alain.frisch@lexifi.com>"
@@ -8,34 +8,37 @@ authors: [
 license: "LGPL-2.1+ with OCaml linking exception"
 homepage: "https://mmottl.github.io/postgresql-ocaml"
 doc: "https://mmottl.github.io/postgresql-ocaml/api"
-dev-repo: "https://github.com/mmottl/postgresql-ocaml.git"
+dev-repo: "git+https://github.com/mmottl/postgresql-ocaml.git"
 bug-reports: "https://github.com/mmottl/postgresql-ocaml/issues"
 
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 
 depends: [
-  "base-bytes"
+  "ocaml" {>= "4.05"}
+  "dune" {build & >= "1.4.0"}
   "base" {build}
   "stdio" {build}
-  "configurator" {build}
-  "jbuilder" {build & >= "1.0+beta10"}
+  "base-bytes"
 ]
 
 depexts: [
-  [["debian"] ["libpq-dev"]]
-  [["freebsd"] ["database/postgresql96-client"]]
-  [["openbsd"] ["database/postgresql96-client"]]
-  [["ubuntu"] ["libpq-dev"]]
-  [["centos"] ["postgresql-devel"]]
-  [["rhel"] ["postgresql-devel"]]
-  [["fedora"] ["postgresql-devel"]]
-  [["alpine"] ["postgresql-dev"]]
-  [["opensuse"] ["postgresql"]]
-  [["osx" "homebrew"] ["postgresql"]]
-  [["osx" "macports"] ["postgresql96"]]
+  ["libpq-dev"] {os-distribution = "debian"}
+  ["database/postgresql96-client"] {os-distribution = "freebsd"}
+  ["database/postgresql96-client"] {os-distribution = "openbsd"}
+  ["libpq-dev"] {os-distribution = "ubuntu"}
+  ["postgresql-devel"] {os-distribution = "centos"}
+  ["postgresql-devel"] {os-distribution = "rhel"}
+  ["postgresql-devel"] {os-distribution = "fedora"}
+  ["postgresql-dev"] {os-distribution = "alpine"}
+  ["postgresql"] {os-distribution = "opensuse"}
+  ["postgresql"] {os = "macos" & os-distribution = "homebrew"}
+  ["postgresql96"] {os = "macos" & os-distribution = "macports"}
 ]
 
-available: [ ocaml-version >= "4.04" ]
+synopsis: "Bindings to the PostgreSQL library"
+
+description: """
+Postgresql offers library functions for accessing PostgreSQL databases."""
diff --git a/src/Makefile b/src/Makefile
@@ -3,7 +3,7 @@ TARGETS = postgresql.cma libpostgresql_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
-JBUILDER_ROOT = ../..
 
 .PHONY: all clean
 
 all:
-	@jbuilder build --dev $(TARGETS)
+	@dune build $(TARGETS)
 
 clean:
-	@jbuilder clean
+	@dune clean
diff --git a/src/config/discover.ml b/src/config/discover.ml
@@ -2,7 +2,7 @@ open Base
 open Stdio
 
 let () =
-  let module C = Configurator in
+  let module C = Configurator.V1 in
   C.main ~name:"postgresql" (fun _c ->
     let cmd = "pg_config --includedir --libdir --version" in
     let ic =
@@ -56,9 +56,5 @@ let () =
         cflags = [pgsql_includedir; major; minor];
         libs = [pgsql_libdir; "-lpq"];
       } 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))
diff --git a/src/config/dune b/src/config/dune
@@ -0,0 +1,4 @@
+(executables
+  (names discover)
+  (libraries base stdio dune.configurator)
+)
diff --git a/src/config/jbuild b/src/config/jbuild
diff --git a/src/dune b/src/dune
@@ -0,0 +1,17 @@
+(library
+  (public_name postgresql)
+  (c_names postgresql_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))
+  (libraries threads bigarray)
+)
+
+(rule
+  (targets c_flags.sexp c_library_flags.sexp)
+  (deps (:discover config/discover.exe))
+  (action (run %{discover}))
+)
diff --git a/src/jbuild b/src/jbuild

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +(env
 +  (dev (flags (:standard -w -9 -principal)))
 +  (release (ocamlopt_flags (:standard -O3)))
 +)
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+(lang dune 1.1)`
	`2`	`+(name postgresql)`