Single package with variants (mirage/mirage#969)

dune-universe · Feb 13, 2019 · 4c933c5 · 4c933c5
1 parent 8775c09
commit 4c933c5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 105 deletions.
diff --git a/lib_impl/freestanding/dune b/lib_impl/freestanding/dune
@@ -1,8 +1,8 @@
 (library
   (name        mirage_entropy_freestanding)
-  (public_name mirage-entropy-freestanding)
+  (public_name mirage-entropy.freestanding)
   (libraries   lwt cstruct mirage-solo5 ocaml-freestanding)
-  (implements mirage-entropy)
+  (implements  mirage-entropy)
   (c_names     entropy_cpu_stubs)
   (c_flags     (:include cflags.sexp) -O3 -std=c99 -Wall -Wpedantic
   )

diff --git a/lib_impl/unix/dune b/lib_impl/unix/dune
@@ -1,11 +1,11 @@
 (library
   (name        mirage_entropy_unix)
-  (public_name mirage-entropy-unix)
+  (public_name mirage-entropy.unix)
   (libraries   lwt cstruct mirage-unix)
   (implements  mirage-entropy)
   (c_names     entropy_cpu_stubs)
   (c_flags     (:include cflags.sexp) -O3 -std=c99 -Wall -Wpedantic
-  ) 
+  )
 )
 
 (rule (copy# ../entropy_cpu_stubs.c entropy_cpu_stubs.c))

diff --git a/lib_impl/xen/dune b/lib_impl/xen/dune
@@ -1,11 +1,11 @@
 (library
   (name        mirage_entropy_xen)
-  (public_name mirage-entropy-xen)
+  (public_name mirage-entropy.xen)
   (libraries   lwt cstruct mirage-xen)
-  (implements mirage-entropy)
+  (implements  mirage-entropy)
   (c_names     entropy_cpu_stubs)
   (c_flags     (:include cflags.sexp) -O3 -std=c99 -Wall -Wpedantic
-  ) 
+  )
 )
 
 (rule (copy# ../entropy_cpu_stubs.c entropy_cpu_stubs.c))

diff --git a/mirage-entropy-freestanding.opam b/mirage-entropy-freestanding.opam
diff --git a/mirage-entropy-unix.opam b/mirage-entropy-unix.opam
diff --git a/mirage-entropy-xen.opam b/mirage-entropy-xen.opam
diff --git a/mirage-entropy.opam b/mirage-entropy.opam
@@ -15,6 +15,12 @@ depends: [
   "cstruct"
   "lwt"
 ]
+depopts: [
+  "mirage-solo5"
+  "ocaml-freestanding"
+  "mirage-unix"
+  "mirage-xen"
+]
 conflicts: [
   "cstruct" {<"1.4.0"}
 ]