use dune variants

.github/workflows/esy.yml

@@ -30,14 +30,10 @@ jobs:
             "dependencies": {
               "ocaml": "4.12.x",
               "@opam/mirage-clock": "*",
-              "@opam/mirage-clock-unix": "*",
-              "@opam/mirage-clock-solo5": "*",
               "reason-mobile": "github:EduardoRFS/reason-mobile:generate.json#7ba258319b87943d2eb0d8fb84562d0afeb2d41f"
             },
             "resolutions": {
               "@opam/mirage-clock": "./mirage-clock.opam",
-              "@opam/mirage-clock-unix": "./mirage-clock-unix.opam",
-              "@opam/mirage-clock-solo5": "./mirage-clock-solo5.opam"
             }
           }' > esy.json
 

appveyor.yml

@@ -6,8 +6,8 @@ environment:
   FORK_BRANCH: master
   CYG_ROOT: C:\cygwin64
   OPAM_SWITCH: 4.08.0+mingw64c
-  PINS: "mirage-clock.dev:. mirage-clock-unix.dev:."
-  PACKAGE: "mirage-clock-unix"
+  PINS: "mirage-clock.dev:."
+  PACKAGE: "mirage-clock"
 
 install:
   - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1"))

config/discover.ml

@@ -1,7 +1,7 @@
 module C = Configurator.V1
 
 let () =
-  C.main ~name:"mirage-clock-unix" (fun c ->
+  C.main ~name:"mirage-clock" (fun c ->
       let is_android =
         let defines =
           C.C_define.import c ~includes:[] [ ("__ANDROID__", Switch) ]

lib_test/dune

@@ -1,4 +1,4 @@
 (test
  (name portable)
- (package mirage-clock-unix)
- (libraries mirage-clock-unix))
+ (package mirage-clock)
+ (libraries mirage-clock))

lib_test/portable.ml

@@ -1,3 +1,5 @@
+open Mirage_clock
+
 let print_time c =
   let d, ps = Pclock.now_d_ps c in
   Printf.printf "The time is %d days and %Ld picoseconds since the epoch.\n" d

solo5/dune

@@ -1,8 +1,7 @@
 (library
  (name mirage_clock_solo5)
- (wrapped false)
- (public_name mirage-clock-solo5)
- (libraries mirage-clock)
+ (public_name mirage-clock.solo5)
+ (implements mirage-clock)
  (foreign_stubs
   (language c)
   (names clock_stubs)))

solo5/mirage_clock.ml

@@ -0,0 +1,2 @@
+module Pclock = Pclock
+module Mclock = Mclock

src/dune

@@ -1,3 +1,5 @@
 (library
  (name mirage_clock)
- (public_name mirage-clock))
+ (public_name mirage-clock)
+ (virtual_modules mirage_clock)
+ (default_implementation mirage-clock.unix))

src/mirage_clock.ml → src/mirage_clock.mli

@@ -22,7 +22,7 @@
 (** {2 POSIX clock}
 
     Clock counting time since the Unix epoch. Subject to adjustment by e.g. NTP. *)
-module type PCLOCK = sig
+module Pclock : sig
   val now_d_ps : unit -> int * int64
   (** [now_d_ps ()] is [(d, ps)] representing the POSIX time occurring at [d] *
       86'400e12 + [ps] POSIX picoseconds from the epoch 1970-01-01 00:00:00 UTC.
@@ -43,7 +43,7 @@ end
 
     Clock returning monotonic time since an arbitrary point. To be used for e.g.
     profiling. *)
-module type MCLOCK = sig
+module Mclock : sig
   val elapsed_ns : unit -> int64
   (** [elapsed_ns ()] is a monotonically increasing count of nanoseconds elapsed
       since some arbitrary point *)

unix/dune

@@ -1,8 +1,8 @@
 (library
  (name mirage_clock_unix)
- (wrapped false)
- (public_name mirage-clock-unix)
- (libraries mirage-clock unix)
+ (public_name mirage-clock.unix)
+ (implements mirage-clock)
+ (libraries unix)
  (foreign_stubs
   (language c)
   (flags

unix/mirage_clock.ml

@@ -0,0 +1,2 @@
+module Pclock = Pclock
+module Mclock = Mclock