Eliminate logs-syslog.lwt.common package

hannesm · Aug 17, 2018 · 1e77ba6 · 1e77ba6
1 parent 8aa6e40
commit 1e77ba6
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 _build/
 logs-syslog.install
-src/.merlin
+src/**/.merlin
 
 example/mirage-unikernel-*.opam
 example/.mirage.config

diff --git a/src/dune b/src/dune
@@ -14,42 +14,3 @@
   (synopsis    "Unix syslog reporter")
   (libraries   logs-syslog ptime.clock.os unix)
   (modules     logs_syslog_unix))
-
-(library
-  (name        logs_syslog_lwt_common)
-  (public_name logs-syslog.lwt.common)
-  (libraries   logs-syslog lwt)
-  (optional)
-  (modules     logs_syslog_lwt_common))
-
-(library
-  (name        logs_syslog_lwt)
-  (public_name logs-syslog.lwt)
-  (synopsis    "Lwt syslog reporter")
-  (libraries   logs-syslog logs-syslog.lwt.common ptime.clock.os lwt lwt.unix)
-  (optional)
-  (modules     logs_syslog_lwt))
-
-(library
-  (name        logs_syslog_lwt_tls)
-  (public_name logs-syslog.lwt.tls)
-  (synopsis    "Lwt TLS syslog reporter")
-  (libraries   logs-syslog.lwt x509 tls tls.lwt cstruct)
-  (optional)
-  (modules     logs_syslog_lwt_tls))
-
-(library
-  (name        logs_syslog_mirage)
-  (public_name logs-syslog.mirage)
-  (synopsis    "Mirage syslog reporter")
-  (libraries   logs-syslog.lwt.common ipaddr lwt mirage-console-lwt mirage-clock mirage-stack-lwt cstruct)
-  (optional)
-  (modules     logs_syslog_mirage))
-
-(library
-  (name        logs_syslog_mirage_tls)
-  (public_name logs-syslog.mirage.tls)
-  (synopsis    "Mirage TLS syslog reporter")
-  (libraries   logs-syslog.mirage x509 tls tls.mirage mirage-kv-lwt)
-  (optional)
-  (modules     logs_syslog_mirage_tls))
diff --git a/src/lwt-tls/dune b/src/lwt-tls/dune
@@ -0,0 +1,9 @@
+(library
+  (name        logs_syslog_lwt_tls)
+  (public_name logs-syslog.lwt.tls)
+  (synopsis    "Lwt TLS syslog reporter")
+  (libraries   logs-syslog.lwt x509 tls tls.lwt cstruct)
+  (optional))
+
+(rule (copy ../logs_syslog_lwt_common.mli logs_syslog_lwt_common.mli))
+(rule (copy ../logs_syslog_lwt_common.ml logs_syslog_lwt_common.ml))
diff --git a/src/logs_syslog_lwt_tls.ml → src/lwt-tls/logs_syslog_lwt_tls.ml b/src/logs_syslog_lwt_tls.ml → src/lwt-tls/logs_syslog_lwt_tls.ml
diff --git a/src/logs_syslog_lwt_tls.mli → src/lwt-tls/logs_syslog_lwt_tls.mli b/src/logs_syslog_lwt_tls.mli → src/lwt-tls/logs_syslog_lwt_tls.mli
diff --git a/src/lwt/dune b/src/lwt/dune
@@ -0,0 +1,9 @@
+(library
+  (name        logs_syslog_lwt)
+  (public_name logs-syslog.lwt)
+  (synopsis    "Lwt syslog reporter")
+  (libraries   logs-syslog ptime.clock.os lwt lwt.unix)
+  (optional))
+
+(rule (copy ../logs_syslog_lwt_common.mli logs_syslog_lwt_common.mli))
+(rule (copy ../logs_syslog_lwt_common.ml logs_syslog_lwt_common.ml))
diff --git a/src/logs_syslog_lwt.ml → src/lwt/logs_syslog_lwt.ml b/src/logs_syslog_lwt.ml → src/lwt/logs_syslog_lwt.ml
diff --git a/src/logs_syslog_lwt.mli → src/lwt/logs_syslog_lwt.mli b/src/logs_syslog_lwt.mli → src/lwt/logs_syslog_lwt.mli
diff --git a/src/mirage-tls/dune b/src/mirage-tls/dune
@@ -0,0 +1,9 @@
+(library
+  (name        logs_syslog_mirage_tls)
+  (public_name logs-syslog.mirage.tls)
+  (synopsis    "Mirage TLS syslog reporter")
+  (libraries   logs-syslog.mirage x509 tls tls.mirage mirage-kv-lwt)
+  (optional))
+
+(rule (copy ../logs_syslog_lwt_common.mli logs_syslog_lwt_common.mli))
+(rule (copy ../logs_syslog_lwt_common.ml logs_syslog_lwt_common.ml))
diff --git a/src/logs_syslog_mirage_tls.ml → src/mirage-tls/logs_syslog_mirage_tls.ml b/src/logs_syslog_mirage_tls.ml → src/mirage-tls/logs_syslog_mirage_tls.ml
diff --git a/src/logs_syslog_mirage_tls.mli → src/mirage-tls/logs_syslog_mirage_tls.mli b/src/logs_syslog_mirage_tls.mli → src/mirage-tls/logs_syslog_mirage_tls.mli
diff --git a/src/mirage/dune b/src/mirage/dune
@@ -0,0 +1,9 @@
+(library
+  (name        logs_syslog_mirage)
+  (public_name logs-syslog.mirage)
+  (synopsis    "Mirage syslog reporter")
+  (libraries   logs-syslog ipaddr lwt mirage-console-lwt mirage-clock mirage-stack-lwt cstruct)
+  (optional))
+
+(rule (copy ../logs_syslog_lwt_common.mli logs_syslog_lwt_common.mli))
+(rule (copy ../logs_syslog_lwt_common.ml logs_syslog_lwt_common.ml))
diff --git a/src/logs_syslog_mirage.ml → src/mirage/logs_syslog_mirage.ml b/src/logs_syslog_mirage.ml → src/mirage/logs_syslog_mirage.ml
diff --git a/src/logs_syslog_mirage.mli → src/mirage/logs_syslog_mirage.mli b/src/logs_syslog_mirage.mli → src/mirage/logs_syslog_mirage.mli