From 1e77ba61af834c9e81775ce519965f133aa4887e Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Fri, 17 Aug 2018 11:58:47 +0100 Subject: [PATCH] Eliminate logs-syslog.lwt.common package --- .gitignore | 2 +- src/dune | 39 ------------------- src/lwt-tls/dune | 9 +++++ src/{ => lwt-tls}/logs_syslog_lwt_tls.ml | 0 src/{ => lwt-tls}/logs_syslog_lwt_tls.mli | 0 src/lwt/dune | 9 +++++ src/{ => lwt}/logs_syslog_lwt.ml | 0 src/{ => lwt}/logs_syslog_lwt.mli | 0 src/mirage-tls/dune | 9 +++++ .../logs_syslog_mirage_tls.ml | 0 .../logs_syslog_mirage_tls.mli | 0 src/mirage/dune | 9 +++++ src/{ => mirage}/logs_syslog_mirage.ml | 0 src/{ => mirage}/logs_syslog_mirage.mli | 0 14 files changed, 37 insertions(+), 40 deletions(-) create mode 100644 src/lwt-tls/dune rename src/{ => lwt-tls}/logs_syslog_lwt_tls.ml (100%) rename src/{ => lwt-tls}/logs_syslog_lwt_tls.mli (100%) create mode 100644 src/lwt/dune rename src/{ => lwt}/logs_syslog_lwt.ml (100%) rename src/{ => lwt}/logs_syslog_lwt.mli (100%) create mode 100644 src/mirage-tls/dune rename src/{ => mirage-tls}/logs_syslog_mirage_tls.ml (100%) rename src/{ => mirage-tls}/logs_syslog_mirage_tls.mli (100%) create mode 100644 src/mirage/dune rename src/{ => mirage}/logs_syslog_mirage.ml (100%) rename src/{ => mirage}/logs_syslog_mirage.mli (100%) diff --git a/.gitignore b/.gitignore index c881242..b3068de 100644 --- 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 index 46a89cb..489eee2 100644 --- 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 new file mode 100644 index 0000000..7e0c0b0 --- /dev/null +++ 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 b/src/lwt-tls/logs_syslog_lwt_tls.ml similarity index 100% rename from src/logs_syslog_lwt_tls.ml rename to src/lwt-tls/logs_syslog_lwt_tls.ml diff --git a/src/logs_syslog_lwt_tls.mli b/src/lwt-tls/logs_syslog_lwt_tls.mli similarity index 100% rename from src/logs_syslog_lwt_tls.mli rename to src/lwt-tls/logs_syslog_lwt_tls.mli diff --git a/src/lwt/dune b/src/lwt/dune new file mode 100644 index 0000000..849777a --- /dev/null +++ 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 b/src/lwt/logs_syslog_lwt.ml similarity index 100% rename from src/logs_syslog_lwt.ml rename to src/lwt/logs_syslog_lwt.ml diff --git a/src/logs_syslog_lwt.mli b/src/lwt/logs_syslog_lwt.mli similarity index 100% rename from src/logs_syslog_lwt.mli rename to src/lwt/logs_syslog_lwt.mli diff --git a/src/mirage-tls/dune b/src/mirage-tls/dune new file mode 100644 index 0000000..5fb9047 --- /dev/null +++ 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 b/src/mirage-tls/logs_syslog_mirage_tls.ml similarity index 100% rename from src/logs_syslog_mirage_tls.ml rename to src/mirage-tls/logs_syslog_mirage_tls.ml diff --git a/src/logs_syslog_mirage_tls.mli b/src/mirage-tls/logs_syslog_mirage_tls.mli similarity index 100% rename from src/logs_syslog_mirage_tls.mli rename to src/mirage-tls/logs_syslog_mirage_tls.mli diff --git a/src/mirage/dune b/src/mirage/dune new file mode 100644 index 0000000..eca720f --- /dev/null +++ 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 b/src/mirage/logs_syslog_mirage.ml similarity index 100% rename from src/logs_syslog_mirage.ml rename to src/mirage/logs_syslog_mirage.ml diff --git a/src/logs_syslog_mirage.mli b/src/mirage/logs_syslog_mirage.mli similarity index 100% rename from src/logs_syslog_mirage.mli rename to src/mirage/logs_syslog_mirage.mli