Merge pull request #10 from kc284/master

Moved from jbuilder to dune.

.travis.yml

@@ -1,11 +1,12 @@
 language: c
-install:
-  - wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
-  - wget https://raw.githubusercontent.com/simonjbeaumont/ocaml-travis-coveralls/master/travis-coveralls.sh
-script: bash -ex .travis-opam.sh
+sudo: required
+service: docker
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-docker.sh
+script: bash -ex .travis-docker.sh
 env:
+  global:
+    - PACKAGE="cdrom"
+    - PINS="cdrom:."
+    - BASE_REMOTE="https://github.com/xapi-project/xs-opam.git"
   matrix:
-    - OCAML_VERSION=4.02 PACKAGE=cdrom
-    - OCAML_VERSION=4.03 PACKAGE=cdrom
-    - OCAML_VERSION=4.04 PACKAGE=cdrom
-    - OCAML_VERSION=4.05 PACKAGE=cdrom
+    - DISTRO="debian-9-ocaml-4.06"

ChangeLog

@@ -1,3 +1,6 @@
+0.9.4 (06-Dec-2018):
+* port to dune
+
 0.9.3 (04-Aug-2017):
 * port to jbuilder
 

MAINTAINERS

@@ -8,6 +8,4 @@ include a Signed-off-by: line.
 Maintainers list
 ----------------
 
-* David Scott <[email protected]>
-* Euan Harris <[email protected]>
-
+* [email protected]

Makefile

@@ -1,27 +1,25 @@
-.PHONY: build release install uninstall clean test doc reindent
+PROFILE=release
 
-build:
-	jbuilder build @install --dev
+.PHONY: build install uninstall clean test doc reindent
 
-release:
-	jbuilder build @install
+build:
+	dune build @install --profile=$(PROFILE)
 
 install:
-	jbuilder install
+	dune install
 
 uninstall:
-	jbuilder uninstall
+	dune uninstall
 
 clean:
-	jbuilder clean
+	dune clean
 
 test:
-	jbuilder runtest
+	dune runtest --profile=$(PROFILE)
 
 # requires odoc
 doc:
-	jbuilder build @doc
+	dune build @doc --profile=$(PROFILE)
 
 reindent:
-	ocp-indent --inplace **/*.ml
-	ocp-indent --inplace **/*.mli
+	git ls-files '*.ml*' | xargs ocp-indent --inplace

README.md

@@ -1,5 +1,6 @@
 Query CDROM devices
 ===================
+
 [![Build Status](https://travis-ci.org/xapi-project/cdrom.svg?branch=master)](https://travis-ci.org/xapi-project/cdrom)
 
 Simple OCaml bindings for functions to query the state of CDROM devices.

cdrom.opam

@@ -1,11 +1,15 @@
-opam-version: "1.2"
+opam-version: "2.0"
 name: "cdrom"
+version: "0.9.4"
 maintainer: "[email protected]"
-author: "Dave Scott <[email protected]>"
 homepage: "https://github.com/xapi-project/cdrom"
-dev-repo: "https://github.com/xapi-project/cdrom"
+dev-repo: "git+https://github.com/xapi-project/cdrom.git"
 bug-reports: "https://github.com/xapi-project/cdrom/issues"
-build: ["jbuilder" "build" "-p" name "-j" jobs]
+build: ["dune" "build" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build}
+  "ocaml"
+  "dune" {build}
 ]
+tags: [ "org:xapi-project" ]
+synopsis: "Query the state and contents of CDROM devices under Linux"
+authors: "Dave Scott <[email protected]>"

cli/dune

@@ -0,0 +1,5 @@
+(executable
+  (name query)
+  (public_name query-cdrom)
+  (libraries cdrom)
+)

dune-project

@@ -0,0 +1 @@
+(lang dune 1.4)

lib/dune

@@ -0,0 +1,6 @@
+(library
+  (name cdrom)
+  (public_name cdrom)
+  (libraries unix)
+  (c_names cdrom_stubs)
+)