fewer packages, as suggested by @cfcs

mirage · Aug 15, 2019 · 08869a0 · 08869a0
1 parent def63e0
commit 08869a0
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 253 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,22 +6,15 @@ services:
 sudo: false
 env:
   global:
-    - PINS="dns.dev:. dns-certify.dev:. dns-client.dev:. dns-client-lwt.dev:. dns-client-mirage.dev:. dns-client-unix.dev:. dns-resolver.dev:. dns-server.dev:. dns-tsig.dev:. dns-zone.dev:. dns-cli.dev:. dns-mirage.dev:. dns-resolver-mirage.dev:. dns-server-mirage.dev:. dns-certify-mirage.dev:."
+    - PINS="dns.dev:. dns-certify.dev:. dns-client.dev:. dns-resolver.dev:. dns-server.dev:. dns-tsig.dev:. dns-cli.dev:. dns-mirage.dev:."
   matrix:
     - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns"
-    - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-zone"
     - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-resolver"
     - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-mirage"
-    - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-resolver-mirage"
-    - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-server-mirage"
     - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-certify"
     - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-client"
     - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-server"
-    - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-client-lwt"
     - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-tsig"
-    - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-certify-mirage"
     - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-cli"
-    - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-client-unix"
-    - DISTRO=alpine OCAML_VERSION=4.07 PACKAGE="dns-client-mirage"
 notifications:
   email: false
diff --git a/CHANGES.md b/CHANGES.md
@@ -10,22 +10,22 @@
 * The API does not leak exceptions, but uses the result type where appropriate.
 * TCP transport is well supported and used widely (client uses it by default)
 * Naming: client is a DNS client, resolver is the recursive resolver
-* The DNS library is split into the following opam packages:
+* The DNS library is split into the following opam packages and sublibraries:
   - `dns` - the core library
   - `dns-tsig` - transaction signatures
   - `dns-zone` - zone file parser (mostly taken from the 1.x series)
   - `dns-cli` - command line utilities (odig, onotify, ..)
   - `dns-client` - pure client implementation
-    - `dns-client-unix` - DNS client using the Unix module for communication
-    - `dns-client-lwt` - DNS client using Lwt_unix for communication
-    - `dns-client-mirage` - DNS client using MirageOS for communication
+    - `.unix` - DNS client using the Unix module for communication
+    - `.lwt` - DNS client using Lwt_unix for communication
+    - `.mirage` - DNS client using MirageOS for communication
   - `dns-certify` - helpers for let's encrypt provisioning
-    - `dns-certify-mirage` - certificate provisioning with MirageOS
+    - `.mirage` - certificate provisioning with MirageOS
   - `dns-mirage` - generic MirageOS communication layer
   - `dns-server` - pure server implementation
-    - `dns-server-mirage` - MirageOS primary and secondary server
+    - `.mirage` - MirageOS primary and secondary server
   - `dns-resolver` - pure recursive resolver implementation
-    - `dns-resolver-mirage` - MirageOS recursive resolver
+    - `.mirage` - MirageOS recursive resolver
 * Only OCaml 4.07.0 and above are supported
 * Multicast DNS has been dropped for now
 * A client using async from JS has not been implemented yet

diff --git a/README.md b/README.md
@@ -132,9 +132,7 @@ set repo=git+https://github.com/mirage/ocaml-dns.git
 # the -n parameter means
 # "just register the pin, don't actually install it yet"
 
-foreach pkg ( dns dns-{certify,cli,client{,-lwt,-unix}} \
-              dns-mirage{,-certify,-client,-resolver,-server} \
-              dns-{resolver,server,tsig,zone} )
+foreach pkg ( dns dns-{certify,cli,client,resolver,server,mirage,tsig} )
   opam pin add -y -n $pkg.$version --dev $repo
 end
 ```
@@ -144,17 +142,15 @@ end
 version=4.0.0
 repo=git+https://github.com/mirage/ocaml-dns.git
 
-for pkg in dns dns-{certify,cli,client{,-lwt,-unix}} \
-           dns-mirage{,-certify,-client,-resolver,-server} \
-           dns-{resolver,server,tsig,zone}
+for pkg in dns dns-{certify,cli,client,resolver,server,mirage,tsig}
 do
   opam pin add -y -n $pkg.$version --dev $repo
 done
 ```
 
 Now you can install the packages you need, for instance:
 ```shell
-opam install dns-client-lwt
+opam install dns-client
 ```
 or
 ```shell

diff --git a/app/dune b/app/dune
@@ -32,11 +32,11 @@
   (public_name ozone)
   (package dns-cli)
   (modules ozone)
-  (libraries dns dns-cli dns-zone dns-server bos rresult))
+  (libraries dns dns-cli dns-server.zone dns-server bos rresult))
 
 (executable
   (name         odns)
   (public_name  odns)
   (modules      odns)
   (package      dns-cli)
-  (libraries    dns dns-client-lwt dns-cli cmdliner lwt.unix hex rresult))
+  (libraries    dns dns-client.lwt dns-cli cmdliner lwt.unix hex rresult))
diff --git a/dns-certify-mirage.opam b/dns-certify-mirage.opam
diff --git a/dns-certify.opam b/dns-certify.opam
@@ -12,9 +12,16 @@ depends: [
   "ocaml" {>= "4.07.0"}
   "dns" {= version}
   "dns-tsig" {= version}
+  "dns-mirage" {= version}
   "randomconv"
   "duration"
   "x509" {>= "0.7.1"}
+  "lwt"
+  "tls"
+  "mirage-random"
+  "mirage-time-lwt"
+  "mirage-clock-lwt" {>= "2.0.0"}
+  "mirage-stack-lwt"
 ]
 
 build: [

diff --git a/dns-cli.opam b/dns-cli.opam
@@ -12,8 +12,7 @@ depends: [
   "ocaml" {>= "4.07.0"}
   "dns" {= version}
   "dns-tsig" {= version}
-  "dns-client-lwt" {= version}
-  "dns-zone" {= version}
+  "dns-client" {= version}
   "dns-server" {= version}
   "dns-certify" {= version}
   "rresult"

diff --git a/dns-client-lwt.opam b/dns-client-lwt.opam
diff --git a/dns-client-mirage.opam b/dns-client-mirage.opam
diff --git a/dns-client-unix.opam b/dns-client-unix.opam
diff --git a/dns-client.opam b/dns-client.opam
@@ -22,6 +22,10 @@ depends: [
   "mirage-flow"
   "randomconv"
   "domain-name" {>= "0.3.0"}
+  "ipaddr" {>= "3.0.0"}
+  "lwt"
+  "mirage-stack-lwt"
+  "mirage-random"
 ]
 synopsis: "Pure DNS resolver API"
 description: """

diff --git a/dns-resolver-mirage.opam b/dns-resolver-mirage.opam
diff --git a/dns-resolver.opam b/dns-resolver.opam
@@ -12,9 +12,15 @@ depends: [
   "ocaml" {>= "4.07.0"}
   "dns" {= version}
   "dns-server" {= version}
+  "dns-mirage" {= version}
   "lru" {>= "0.3.0"}
   "duration"
   "randomconv"
+  "lwt"
+  "mirage-time-lwt"
+  "mirage-clock-lwt"
+  "mirage-random"
+  "mirage-stack-lwt"
   "alcotest" {with-test}
 ]
 

diff --git a/dns-server-mirage.opam b/dns-server-mirage.opam
diff --git a/dns-server.opam b/dns-server.opam
@@ -11,10 +11,15 @@ depends: [
   "dune" {build & >= "1.2.0"}
   "ocaml" {>= "4.07.0"}
   "dns" {= version}
+  "dns-mirage" {= version}
   "randomconv"
   "duration"
-  "alcotest" {with-test}
+  "lwt"
+  "mirage-time-lwt"
+  "mirage-clock-lwt"
+  "mirage-stack-lwt"
   "nocrypto" {with-test}
+  "alcotest" {with-test}
   "dns-tsig" {with-test}
 ]
 

diff --git a/dns-zone.opam b/dns-zone.opam
diff --git a/lwt/client/dune b/lwt/client/dune
@@ -1,6 +1,6 @@
 (library
   (name        dns_client_lwt)
   (modules     dns_client_lwt)
-  (public_name dns-client-lwt)
+  (public_name dns-client.lwt)
   (libraries   lwt lwt.unix dns dns-client)
   (wrapped     false))