Merge pull request #65 from djs55/topkg

Prepare to release v1.5.1 with topkg
mirage · May 30, 2017 · aed86d6 · aed86d6
2 parents 6fcd002 + f595dc6
commit aed86d6
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 81 deletions.
diff --git a/CHANGES → CHANGES.md b/CHANGES → CHANGES.md
@@ -1,24 +1,28 @@
-1.5.0 (unreleased)
+## 1.5.1 (2017-05-30):
+* Switch to jbuilder and topkg
+* Update to shared-memory-ring-lwt
+
+## 1.5.0 (2017-01-24)
 * Build with MirageOS 3, and don't build against earlier versions
 * support and test compiler versions 4.03 and 4.04
 * remove unused `id` type
 
-1.4.0 (13-Mar-2016)
+## 1.4.0 (2016-03-13):
 * Remove dependency on camlp4; use ppx instead
 * opam: now pass lint check
 * use logs rather than printf
 * blkfront: serialise calls to `connect`
 * blkfront: strip deprecated prefixes like aio: from params keys
 
-1.3.1 (07-Mar-2015)
+## 1.3.1 (2015-03-07):
 * Add an explicit `connect` to the interface signature (#35)
 
-1.3.0 (29-Jan-2015)
+## 1.3.0 (2015-01-29):
 * Update to `io-page.1.4.0` interface.
 * Add an `opam` 1.2 file for more convenient development.
 * Simplify travis configuration via centralised scripts.
 
-1.2.0 (3-Oct-2014)
+## 1.2.0 (2014-10-03):
 * blkback: add 'force_close' to more forcibly tear down the device
 * blkback: make 'destroy' idempotent
 * blkback: measure ring utilisation; segments per request; total
@@ -28,7 +32,7 @@
   than risk using the wrong disk
 * blkfront: use indirect segments if available
 
-1.1.0 (30-Jan-2014):
+## 1.1.0 (2014-01-30):
 * blkback: functorise over Activations.
 * Depend on `xen-grant` and `xen-event` libraries rather than `xenctrl`.
 * Remove `OS` module, depend on `io-page` (no `-unix` or `-xen`).
@@ -38,42 +42,42 @@
 * blkback: functorise over Activations, xenstore and backing store
 * blkback: add the toolstack-level device create/destroy functions
 
-1.0.0 (10-Dec-2013):
+## 1.0.0 (2013-12-10):
 * Add ISC copyrights everywhere.
 * Indent code with `ocp-indent`.
 
-0.5.0 (8-Dec-2013)
+## 0.5.0 (2013-12-08):
 * Block.connect: if we don't recognise the id, default to the
   first available disk.
 
-0.4.0 (8-Dec-2013)
+## 0.4.0 (2013-12-08):
 * implement new mirage-types BLOCK interface
 
-0.2.5 (10-Nov-2013)
+## 0.2.5 (2013-11-10):
 * fix build against cstruct.0.8.0
 * blkfront write_page only needs to grant read access to
   the backend driver
 
-0.2.4 (13-Oct-2013)
+## 0.2.4 (2013-10-13):
 * fix reading non-page aligned sectors
 
-0.2.3 (5-Oct-2013):
+## 0.2.3 (2013-10-05):
 * add Travis continuous integration scripts.
 * use new Activations.after interface
 
-0.2.2 (8-Aug-2013):
+## 0.2.2 (2013-08-08):
 * update to mirage-platform 0.9.4
 
-0.2.0 (17-Jul-2013):
+## 0.2.0 (2013-07-17):
 * blkback has significantly increased performance through
   mapping all requests on the ring simultaneously
 
-0.1.3 (14-Jul-2013):
+## 0.1.3 (2013-07-14):
 * 32-bit guest support fixed
 * fixed critical bug in previous version which caused pages
   to be mapped with the wrong protection flags, leading to
   immediate segfaults on write
 
-0.1.2 (4-Jul-2013):
+## 0.1.2 (2013-07-04):
 * updated following mirage-xen Gnttab API change
 
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,14 @@
+Copyright (c) 2015, MirageOS
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
diff --git a/lib/META b/lib/META
diff --git a/lib/mirage_block_xen.mldylib b/lib/mirage_block_xen.mldylib
diff --git a/lib/mirage_block_xen.mllib b/lib/mirage_block_xen.mllib
diff --git a/lib/mirage_block_xen_back.mldylib b/lib/mirage_block_xen_back.mldylib
diff --git a/lib/mirage_block_xen_back.mllib b/lib/mirage_block_xen_back.mllib
diff --git a/lib/mirage_block_xen_front.mldylib b/lib/mirage_block_xen_front.mldylib
diff --git a/lib/mirage_block_xen_front.mllib b/lib/mirage_block_xen_front.mllib
diff --git a/mirage-block-xen.opam b/mirage-block-xen.opam
@@ -3,6 +3,8 @@ maintainer:   "[email protected]"
 homepage:     "https://github.com/mirage/mirage-block-xen"
 dev-repo:     "https://github.com/mirage/mirage-block-xen.git"
 bug-reports:  "https://github.com/mirage/mirage-block-xen/issues"
+doc:          "https://mirage.github.io/mirage-block-xen"
+
 authors: [
   "Anil Madhavapeddy"
   "David Scott"

diff --git a/pkg/pkg.ml b/pkg/pkg.ml
@@ -0,0 +1,3 @@
+#!/usr/bin/env ocaml
+#use "topfind"
+#require "topkg-jbuilder.auto"