Merge pull request #15 from avsm/to-dune

Port to dune and upgrade opam metadata to 2.0

Author: edwintorok

.travis.yml

@@ -8,6 +8,9 @@ env:
   global:
   - PACKAGE="xenstore_transport"
   - PINS="xenstore_transport:. xenstore-tool:."
+  - DISTRO="debian-stable"
   matrix:
-  - PACKAGE="xenstore_transport" DISTRO="debian-stable" OCAML_VERSION="4.04.2"
-  - PACKAGE="xenstore-tool"      DISTRO="debian-stable" OCAML_VERSION="4.04.2"
+  - PACKAGE="xenstore_transport" OCAML_VERSION="4.04"
+  - PACKAGE="xenstore-tool"      OCAML_VERSION="4.04"
+  - PACKAGE="xenstore_transport" OCAML_VERSION="4.07"
+  - PACKAGE="xenstore-tool"      OCAML_VERSION="4.07"

ChangeLog

@@ -1,3 +1,8 @@
+1.0.1 (18-Jun-2019):
+* Upgrade build to dune from jbuilder (@avsm)
+* Test OCaml 4.07 in CI (@avsm)
+* Upgrade opam metadata to 2.0 format (@avsm)
+
 1.0.0 (07-Dec-2017):
 * compile with -safe-string
 

bench/dune

@@ -0,0 +1,3 @@
+(executables
+ (names xs_bench)
+ (libraries xenstore_transport xenstore xenstore.unix lwt lwt.unix))

bench/jbuild

@@ -0,0 +1,10 @@
+(executables
+ (names xs_client_cli)
+ (libraries lwt lwt.unix xenstore xenstore_transport)
+ (flags :standard -safe-string))
+
+(install
+ (section bin)
+ (package xenstore-tool)
+ (files
+  (xs_client_cli.exe as xenstore-tool)))

cli/dune

@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name xenstore-tool)

cli/jbuild

@@ -0,0 +1,6 @@
+(library
+ (name xenstore_transport)
+ (public_name xenstore_transport)
+ (libraries lwt xenstore xenstore.client lwt.unix)
+ (wrapped false)
+ (flags :standard -safe-string))

dune-project

@@ -0,0 +1,3 @@
+(executables
+ (names client_test server_test)
+ (libraries xenstore_transport xenstore xenstore.unix oUnit))

lib/dune

@@ -1,4 +1,5 @@
-opam-version: "1.2"
+opam-version: "2.0"
+maintainer: "[email protected]"
 authors: [
   "Christian Lindig"
   "David Scott"
@@ -11,28 +12,24 @@ authors: [
   "Thomas Sanders"
   "Vincent Bernardoff"
 ]
-maintainer: "[email protected]"
-homepage:    "http://github.com/djs55/ocaml-xenstore-clients"
-bug-reports: "http://github.com/djs55/ocaml-xenstore-clients/issues"
-dev-repo:    "http://github.com/djs55/ocaml-xenstore-clients.git"
-doc:         "http://djs55.github.io/ocaml-xenstore-clients"
-license:     "LGPL"
-
-tags: [
-  "org:mirage"
-  "org:xapi-project"
-]
-build: [
-  [ "jbuilder" "subst"] {pinned}
-  [ "jbuilder" "build" "-p" name "-j" jobs ]
-]
-
+license: "LGPL"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "http://github.com/xapi-project/ocaml-xenstore-clients"
+doc: "http://xapi-project.github.io/ocaml-xenstore-clients/"
+bug-reports: "http://github.com/xapi-project/ocaml-xenstore-clients/issues"
 depends: [
-  "ocamlfind" {build}
-  "jbuilder"  {build & >="1.0+beta9"}
+  "ocaml" {>= "4.04.0"}
+  "dune" {build & >= "1.0"}
   "lwt"
   "xenstore" {>= "2.0.0"}
   "xenstore_transport"
 ]
-
-available: [ ocaml-version >= "4.04.0" ]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+]
+dev-repo: "git+http://github.com/xapi-project/ocaml-xenstore-clients.git"
+synopsis: "Command line tool for interfacing with xenstore"
+description: """
+This is a CLI `xs` tool for interfacing with XenStore.
+"""

lib/jbuild

@@ -1,4 +1,5 @@
-opam-version: "1.2"
+opam-version: "2.0"
+maintainer: "[email protected]"
 authors: [
   "Christian Lindig"
   "David Scott"
@@ -11,27 +12,27 @@ authors: [
   "Thomas Sanders"
   "Vincent Bernardoff"
 ]
-maintainer: "[email protected]"
-homepage:    "http://github.com/djs55/ocaml-xenstore-clients"
-bug-reports: "http://github.com/djs55/ocaml-xenstore-clients/issues"
-dev-repo:    "http://github.com/djs55/ocaml-xenstore-clients.git"
-doc:         "http://djs55.github.io/ocaml-xenstore-clients"
-license:     "LGPL"
-
-tags: [
-  "org:mirage"
-  "org:xapi-project"
-]
-build: [
-  [ "jbuilder" "subst"] {pinned}
-  [ "jbuilder" "build" "-p" name "-j" jobs ]
-]
-
+license: "LGPL"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "http://github.com/xapi-project/ocaml-xenstore-clients"
+doc: "http://xapi-project.github.io/ocaml-xenstore-clients"
+bug-reports: "http://github.com/xapi-project/ocaml-xenstore-clients/issues"
 depends: [
+  "ocaml" {>= "4.04.0"}
   "ocamlfind" {build}
-  "jbuilder"  {build & >="1.0+beta9"}
+  "dune" {build & >= "1.0"}
   "lwt"
   "xenstore" {>= "2.0.0"}
 ]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+]
+dev-repo: "git+http://github.com/xapi-project/ocaml-xenstore-clients.git"
+synopsis: "low-level libraries for connecting to a xenstore service on a xen host."
+description: """
+These libraries contain the IO functions for communicating with a
+xenstore service on a xen host. One subpackage deals with regular Unix
+threads and another deals with Lwt co-operative threads.
+"""
 
-available: [ ocaml-version >= "4.04.0" ]