Use virtual_modules in Dune 1.7

.travis.yml

@@ -6,11 +6,12 @@ install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/ma
 script: bash -ex ./.travis-docker.sh
 env:
   global:
-  - PINS="io-page:. io-page-unix:. io-page-xen:."
+  - PINS="io-page.dev:. io-page-unix.dev:. io-page-xen.dev:. io-page-js.dev:. dune:--dev"
+  - PACKAGE=io-page
+  - DEPOPTS="io-page-unix io-page-xen io-page-js"
   matrix:
-  - DISTRO="debian-stable" OCAML_VERSION=4.04 PACKAGE="io-page"
-  - DISTRO="debian-stable" OCAML_VERSION=4.04 PACKAGE="io-page-unix"
-  - DISTRO="debian-stable" OCAML_VERSION=4.04 PACKAGE="io-page-xen"
-  - DISTRO="alpine"        OCAML_VERSION=4.06 PACKAGE="io-page"
-  - DISTRO="alpine"        OCAML_VERSION=4.07 PACKAGE="io-page"
-  - DISTRO="alpine"        OCAML_VERSION=4.08 PACKAGE="io-page"
+  - DISTRO="debian-stable" OCAML_VERSION=4.04
+  - DISTRO="debian-stable" OCAML_VERSION=4.05
+  - DISTRO="alpine"        OCAML_VERSION=4.06
+  - DISTRO="alpine"        OCAML_VERSION=4.07
+  - DISTRO="alpine"        OCAML_VERSION=4.08

CHANGES.md

@@ -1,3 +1,21 @@
+## v3.0.0
+
+* Use `virtual_modules` in Dune 1.7 to allow use of the interface
+  file separately from the implementations.
+
+  We now provide separate implementations that use dune variants
+  so that they can be found via a variants tag search:
+
+  - `unix` (Unix or Windows)
+  - `js` (JavaScript)
+  - `xen` (Xen)
+
+  This cleans up the utop toplevel support as well to work by
+  default now. (@avsm, fixes #50)
+
+* Use implicit transitive dependencies, which will become the
+  default in dune 2.0
+
 ## v2.3.0 (2019-06-20)
 * Hook in the JavaScript stubs to dune (#55 @jonludlam)
 * Remove unnecessary dependency on `configurator`, which pulled

META.io-page-xen.template

@@ -1,4 +1,2 @@
-# JBUILDER_GEN
-
+# DUNE_GEN
 xen_linkopts = "-lio_page_xen_stubs"
-

dune-project

@@ -1,2 +1,4 @@
-(lang dune 1.0)
+(lang dune 1.11)
 (name io-page)
+(using library_variants 0.1)
+(implicit_transitive_deps false)

io-page-js.opam

@@ -0,0 +1,25 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: ["Anil Madhavapeddy" "Dave Scott" "Thomas Gazagnaire"]
+license: "ISC"
+tags: "org:mirage"
+homepage: "https://github.com/mirage/io-page"
+bug-reports: "https://github.com/mirage/io-page/issues"
+doc: "https://mirage.github.io/io-page/"
+depends: [
+  "ocaml" {>= "4.02.3"}
+  "dune" {>="1.7"}
+  "io-page" {=version}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+]
+dev-repo: "git+https://github.com/mirage/io-page.git"
+synopsis: "Support for efficient handling of I/O memory pages"
+description: """
+IO pages are page-aligned, and wrapped in the `Cstruct` library to avoid
+copying the data contained within the page.  This is the JavaScript
+implementation.
+"""
+

lib/intf/dune

@@ -0,0 +1,7 @@
+(library
+ (name io_page)
+ (public_name io-page)
+ (virtual_modules io_page)
+ (wrapped false)
+ (default_implementation unix)
+ (libraries cstruct bigarray-compat))

lib/js/dune

@@ -0,0 +1,9 @@
+(copy_files ../impl/io_page.ml)
+
+(library
+  (name io_page_js)
+  (public_name io-page-js)
+  (libraries bigarray-compat cstruct)
+  (implements io-page)
+  (js_of_ocaml (javascript_files io-page.js))
+  (variant js))

lib/unix/dune

@@ -0,0 +1,10 @@
+(copy_files ../*.c)
+(copy_files ../impl/io_page.ml)
+
+(library
+  (name io_page_unix)
+  (public_name io-page-unix)
+  (implements io-page)
+  (libraries bigarray-compat cstruct)
+  (c_names stub_alloc_pages stub_get_addr)
+  (variant unix))

lib/xen/dune

@@ -0,0 +1,16 @@
+(copy_files ../*.c)
+(copy_files ../impl/io_page.ml)
+
+(library
+  (name io_page_xen)
+  (public_name io-page-xen)
+  (implements io-page)
+  (libraries bigarray-compat cstruct)
+  (c_names stub_alloc_pages stub_get_addr)
+  (c_flags (:include c_flags_xen.sexp))
+  (variant xen))
+
+(rule
+ (targets c_flags_xen.sexp)
+ (deps ../config/discover.exe)
+ (action (run %{deps})))