From eecafadeb7332c189fdd2994d888be687f96dbbc Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Tue, 14 Sep 2021 17:18:33 +0200 Subject: [PATCH] Build: manifest-generated lib_clic, lib_event_logging, lib_micheline, lib_stdlib_unix, lib_base --- src/lib_base/dune | 48 ++++++++++--------- src/lib_base/test/dune | 45 +++++++---------- src/lib_base/test_helpers/dune | 19 ++++---- .../test_helpers/tezos-base-test-helpers.opam | 7 +-- src/lib_base/tezos-base.opam | 16 ++++--- src/lib_base/unix/dune | 35 +++++++------- src/lib_base/unix/test/dune | 20 ++++---- src/lib_clic/dune | 23 ++++----- src/lib_clic/test/dune | 12 ++--- src/lib_clic/tezos-clic.opam | 7 +-- src/lib_clic/unix/dune | 23 ++++----- src/lib_crypto/test/lib_alcotest_glue/js/dune | 5 +- .../test/lib_alcotest_glue/unix/dune | 3 +- .../test/lib_alcotest_glue/virtual/dune | 4 +- src/lib_error_monad/test/dune | 6 ++- src/lib_event_logging/dune | 24 +++++----- src/lib_event_logging/test_helpers/dune | 25 +++++----- .../tezos-event-logging-test-helpers.opam | 4 +- .../tezos-event-logging.opam | 4 +- src/lib_hacl_glue/js/src/dune | 3 +- src/lib_hacl_glue/unix/dune | 4 +- .../bare/functor_outputs/dune | 3 +- src/lib_lwt_result_stdlib/bare/sigs/dune | 4 +- src/lib_lwt_result_stdlib/bare/structs/dune | 4 +- .../traced/functor_outputs/dune | 4 +- src/lib_micheline/dune | 14 ++---- src/lib_micheline/test/dune | 9 ++-- src/lib_micheline/tezos-micheline.opam | 10 ++-- src/lib_rpc/dune | 6 ++- src/lib_stdlib/dune | 5 +- src/lib_stdlib_unix/dune | 42 ++++++++-------- src/lib_stdlib_unix/tezos-stdlib-unix.opam | 9 ++-- src/lib_test/dune | 7 ++- src/lib_test/tezos-test-helpers.opam | 6 +-- 34 files changed, 247 insertions(+), 213 deletions(-) diff --git a/src/lib_base/dune b/src/lib_base/dune index cba17c16d47b..1d95f0f47026 100644 --- a/src/lib_base/dune +++ b/src/lib_base/dune @@ -1,28 +1,30 @@ (library (name tezos_base) - (instrumentation (backend bisect_ppx)) (public_name tezos-base) - (flags (:standard -open Tezos_stdlib - -open Tezos_crypto - -open Data_encoding - -open Tezos_error_monad - -open Tezos_error_monad.TzLwtreslib - -open Tezos_rpc - -open Tezos_clic - -open Tezos_micheline - -open Tezos_event_logging - )) - (libraries tezos-stdlib - tezos-crypto - data-encoding - tezos-error-monad - tezos-event-logging - tezos-rpc - tezos-clic - tezos-micheline - ptime - ezjsonm - lwt - ipaddr)) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-stdlib + tezos-crypto + data-encoding + tezos-error-monad + tezos-event-logging + tezos-rpc + tezos-clic + tezos-micheline + ptime + ezjsonm + lwt + ipaddr) + (flags + (:standard + -open Tezos_stdlib + -open Tezos_crypto + -open Data_encoding + -open Tezos_error_monad + -open Tezos_error_monad.TzLwtreslib + -open Tezos_rpc + -open Tezos_clic + -open Tezos_micheline + -open Tezos_event_logging))) (ocamllex point_parser) diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune index fc7c3be187b7..c07d9b9ab6a5 100644 --- a/src/lib_base/test/dune +++ b/src/lib_base/test/dune @@ -1,35 +1,24 @@ (tests (names test_time test_protocol) (package tezos-base) - (modules test_time test_protocol) (libraries - tezos-base - tezos-base.unix - data-encoding - qcheck-alcotest - tezos-test-helpers - ) - (flags (:standard - -open Tezos_base - -open Tezos_error_monad - ))) + tezos-base + tezos-base.unix + data-encoding + qcheck-alcotest + tezos-test-helpers) + (flags (:standard -open Tezos_base -open Tezos_error_monad)) + (modules test_time test_protocol)) -(tests - (names test_p2p_addr) +(test + (name test_p2p_addr) (package tezos-base) - (deps - (file points.ok) - (file points.ko) - ) - (modules test_p2p_addr) (libraries - tezos-base - tezos-base.unix - data-encoding - qcheck-alcotest - tezos-test-helpers - ) - (flags (:standard - -open Tezos_base - -open Tezos_error_monad - ))) + tezos-base + tezos-base.unix + data-encoding + qcheck-alcotest + tezos-test-helpers) + (flags (:standard -open Tezos_base -open Tezos_error_monad)) + (modules test_p2p_addr) + (deps (file points.ok) (file points.ko))) diff --git a/src/lib_base/test_helpers/dune b/src/lib_base/test_helpers/dune index 4232d1a87b3b..1f7c3a4af292 100644 --- a/src/lib_base/test_helpers/dune +++ b/src/lib_base/test_helpers/dune @@ -1,13 +1,12 @@ (library (name tezos_base_test_helpers) (public_name tezos-base-test-helpers) - (libraries tezos-base - tezos-stdlib-unix - tezos-event-logging-test-helpers - tezos-test-helpers - alcotest - alcotest-lwt - qcheck-alcotest) - (flags - (:standard -linkall - -open Tezos_base__TzPervasives))) + (libraries + tezos-base + tezos-stdlib-unix + tezos-event-logging-test-helpers + tezos-test-helpers + alcotest + alcotest-lwt + qcheck-alcotest) + (flags (:standard -linkall -open Tezos_base__TzPervasives))) diff --git a/src/lib_base/test_helpers/tezos-base-test-helpers.opam b/src/lib_base/test_helpers/tezos-base-test-helpers.opam index 33e84ad4abf5..4fe872693a9c 100644 --- a/src/lib_base/test_helpers/tezos-base-test-helpers.opam +++ b/src/lib_base/test_helpers/tezos-base-test-helpers.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" @@ -10,9 +10,10 @@ depends: [ "tezos-base" "tezos-stdlib-unix" "tezos-event-logging-test-helpers" - "alcotest" + "tezos-test-helpers" + "alcotest" { >= "1.4.0" } "alcotest-lwt" { >= "1.4.0" } - "tezos-test-helpers" { with-test } + "qcheck-alcotest" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_base/tezos-base.opam b/src/lib_base/tezos-base.opam index a88906a00128..f72107ef2784 100644 --- a/src/lib_base/tezos-base.opam +++ b/src/lib_base/tezos-base.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" @@ -9,19 +9,21 @@ depends: [ "dune" { >= "2.0" } "tezos-stdlib" "tezos-crypto" - "bls12-381-unix" - "tezos-hacl-glue-unix" "data-encoding" { >= "0.4" & < "0.5" } "tezos-error-monad" "tezos-event-logging" - "tezos-micheline" "tezos-rpc" "tezos-clic" + "tezos-micheline" "ptime" { >= "0.8.4" } "ezjsonm" { >= "0.5.0" } - "ipaddr" {>= "5.0.0" & < "6.0.0"} - "tezos-test-helpers" { with-test } - "qcheck-alcotest" { with-test } + "lwt" { >= "5.4.0" } + "ipaddr" { >= "5.0.0" & < "6.0.0" } + "bls12-381-unix" + "tezos-hacl-glue-unix" + "tezos-stdlib-unix" + "qcheck-alcotest" {with-test} + "tezos-test-helpers" {with-test} ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_base/unix/dune b/src/lib_base/unix/dune index df6c7eac8316..d0aa8b861b45 100644 --- a/src/lib_base/unix/dune +++ b/src/lib_base/unix/dune @@ -6,20 +6,23 @@ (library (name tezos_base_unix) - (instrumentation (backend bisect_ppx)) (public_name tezos-base.unix) - (flags (:standard -open Tezos_error_monad - -open Tezos_crypto - -open Tezos_base - -open Tezos_stdlib - -open Tezos_stdlib_unix - -open Data_encoding)) - (libraries data-encoding - tezos-crypto - bls12-381-unix - ; unix implementation of hacl - tezos-hacl-glue-unix - tezos-base - tezos-stdlib - tezos-stdlib-unix - tezos-error-monad)) + (instrumentation (backend bisect_ppx)) + (libraries + data-encoding + tezos-crypto + bls12-381-unix + ; unix implementation of hacl + tezos-hacl-glue-unix + tezos-base + tezos-stdlib + tezos-stdlib-unix + tezos-error-monad) + (flags + (:standard + -open Tezos_error_monad + -open Tezos_crypto + -open Tezos_base + -open Tezos_stdlib + -open Tezos_stdlib_unix + -open Data_encoding))) diff --git a/src/lib_base/unix/test/dune b/src/lib_base/unix/test/dune index 3dd3be71eb25..228022aafaf9 100644 --- a/src/lib_base/unix/test/dune +++ b/src/lib_base/unix/test/dune @@ -1,14 +1,10 @@ -(tests +(test + (name test_unix_error) (package tezos-base) - (names test_unix_error) (libraries - tezos-base.unix - data-encoding - tezos-test-helpers - qcheck-alcotest - ) - (flags (:standard - -open Tezos_base - -open Tezos_base_unix - -open Tezos_error_monad - ))) + tezos-base.unix + data-encoding + tezos-test-helpers + qcheck-alcotest) + (flags + (:standard -open Tezos_base -open Tezos_base_unix -open Tezos_error_monad))) diff --git a/src/lib_clic/dune b/src/lib_clic/dune index 95cb4b0ef829..85b7e81d318f 100644 --- a/src/lib_clic/dune +++ b/src/lib_clic/dune @@ -1,14 +1,15 @@ (library (name tezos_clic) - (instrumentation (backend bisect_ppx)) (public_name tezos-clic) - (flags (:standard -open Tezos_stdlib - -open Tezos_error_monad - -open Tezos_error_monad.TzLwtreslib - )) - (libraries tezos-stdlib - lwt - re - tezos-error-monad - tezos-lwt-result-stdlib - )) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-stdlib + lwt + re + tezos-error-monad + tezos-lwt-result-stdlib) + (flags + (:standard + -open Tezos_stdlib + -open Tezos_error_monad + -open Tezos_error_monad.TzLwtreslib))) diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune index 51a973e62562..f726a5e4e026 100644 --- a/src/lib_clic/test/dune +++ b/src/lib_clic/test/dune @@ -1,7 +1,7 @@ -(tests - (names test_clic) - (libraries tezos-clic - alcotest-lwt) +(test + (name test_clic) (package tezos-clic) - (flags (:standard -open Tezos_stdlib - -open Tezos_clic))) + (libraries + tezos-clic + alcotest-lwt) + (flags (:standard -open Tezos_stdlib -open Tezos_clic))) diff --git a/src/lib_clic/tezos-clic.opam b/src/lib_clic/tezos-clic.opam index ed8b0b4ca01c..bdcaf52cfcf3 100644 --- a/src/lib_clic/tezos-clic.opam +++ b/src/lib_clic/tezos-clic.opam @@ -1,17 +1,18 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "2.0" } - "re" "tezos-stdlib" - "tezos-stdlib-unix" + "lwt" { >= "5.4.0" } + "re" { >= "1.7.2" } "tezos-error-monad" "tezos-lwt-result-stdlib" + "tezos-stdlib-unix" "alcotest-lwt" { with-test & >= "1.1.0" } ] build: [ diff --git a/src/lib_clic/unix/dune b/src/lib_clic/unix/dune index d58f92c584bd..65df0b02cc91 100644 --- a/src/lib_clic/unix/dune +++ b/src/lib_clic/unix/dune @@ -1,14 +1,15 @@ (library (name tezos_clic_unix) - (instrumentation (backend bisect_ppx)) (public_name tezos-clic.unix) - (flags (:standard -open Tezos_stdlib - -open Tezos_clic - -open Tezos_error_monad - -open Tezos_error_monad.TzLwtreslib - )) - (libraries tezos-clic - tezos-stdlib-unix - tezos-error-monad - tezos-lwt-result-stdlib - )) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-clic + tezos-stdlib-unix + tezos-error-monad + tezos-lwt-result-stdlib) + (flags + (:standard + -open Tezos_stdlib + -open Tezos_clic + -open Tezos_error_monad + -open Tezos_error_monad.TzLwtreslib))) diff --git a/src/lib_crypto/test/lib_alcotest_glue/js/dune b/src/lib_crypto/test/lib_alcotest_glue/js/dune index 9f25f7c2d563..95b7a35e3b5b 100644 --- a/src/lib_crypto/test/lib_alcotest_glue/js/dune +++ b/src/lib_crypto/test/lib_alcotest_glue/js/dune @@ -2,5 +2,8 @@ (name alcotest_glue_js) (public_name alcotest-glue-js) (implements alcotest-glue) - (libraries js_of_ocaml js_of_ocaml-compiler fmt) + (libraries + js_of_ocaml + js_of_ocaml-compiler + fmt) (preprocess (pps js_of_ocaml-ppx))) diff --git a/src/lib_crypto/test/lib_alcotest_glue/unix/dune b/src/lib_crypto/test/lib_alcotest_glue/unix/dune index 20cdc1f50700..c47771c9beb1 100644 --- a/src/lib_crypto/test/lib_alcotest_glue/unix/dune +++ b/src/lib_crypto/test/lib_alcotest_glue/unix/dune @@ -2,4 +2,5 @@ (name alcotest_glue_unix) (public_name alcotest-glue-unix) (implements alcotest-glue) - (libraries alcotest)) + (libraries + alcotest)) diff --git a/src/lib_crypto/test/lib_alcotest_glue/virtual/dune b/src/lib_crypto/test/lib_alcotest_glue/virtual/dune index 24e0fdadd842..2132f63b57a5 100644 --- a/src/lib_crypto/test/lib_alcotest_glue/virtual/dune +++ b/src/lib_crypto/test/lib_alcotest_glue/virtual/dune @@ -1,5 +1,7 @@ (library (name alcotest_glue) (public_name alcotest-glue) - (libraries fmt re) + (libraries + fmt + re) (virtual_modules alcotest_glue)) diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune index 08a1bdb50403..1eacf842cb2f 100644 --- a/src/lib_error_monad/test/dune +++ b/src/lib_error_monad/test/dune @@ -1,5 +1,9 @@ (test (name test_registration) (package tezos-error-monad) - (libraries tezos-error-monad data-encoding lwt.unix alcotest-lwt) + (libraries + tezos-error-monad + data-encoding + lwt.unix + alcotest-lwt) (flags (:standard -open Tezos_error_monad))) diff --git a/src/lib_event_logging/dune b/src/lib_event_logging/dune index 002a7d432be5..ce5aae90e505 100644 --- a/src/lib_event_logging/dune +++ b/src/lib_event_logging/dune @@ -1,14 +1,16 @@ (library (name tezos_event_logging) - (instrumentation (backend bisect_ppx)) (public_name tezos-event-logging) - (flags (:standard -open Tezos_stdlib - -open Data_encoding - -open Tezos_error_monad - -open Tezos_error_monad.TzLwtreslib - )) - (libraries tezos-stdlib - data-encoding - tezos-error-monad - tezos-lwt-result-stdlib - lwt_log.core)) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-stdlib + data-encoding + tezos-error-monad + tezos-lwt-result-stdlib + lwt_log.core) + (flags + (:standard + -open Tezos_stdlib + -open Data_encoding + -open Tezos_error_monad + -open Tezos_error_monad.TzLwtreslib))) diff --git a/src/lib_event_logging/test_helpers/dune b/src/lib_event_logging/test_helpers/dune index f40e1eed8a5e..d73199dd1e90 100644 --- a/src/lib_event_logging/test_helpers/dune +++ b/src/lib_event_logging/test_helpers/dune @@ -1,14 +1,17 @@ (library (name tezos_event_logging_test_helpers) (public_name tezos-event-logging-test-helpers) - (libraries tezos-stdlib - tezos-lwt-result-stdlib - data-encoding - tezos-error-monad - tezos-event-logging - tezos-test-helpers - alcotest) - (flags (:standard -linkall - -open Tezos_error_monad - -open Tezos_error_monad.TzLwtreslib - -open Tezos_event_logging))) + (libraries + tezos-stdlib + tezos-lwt-result-stdlib + data-encoding + tezos-error-monad + tezos-event-logging + tezos-test-helpers + alcotest) + (flags + (:standard + -linkall + -open Tezos_error_monad + -open Tezos_error_monad.TzLwtreslib + -open Tezos_event_logging))) diff --git a/src/lib_event_logging/test_helpers/tezos-event-logging-test-helpers.opam b/src/lib_event_logging/test_helpers/tezos-event-logging-test-helpers.opam index 2efe31f61af5..8e6ce804ed8f 100644 --- a/src/lib_event_logging/test_helpers/tezos-event-logging-test-helpers.opam +++ b/src/lib_event_logging/test_helpers/tezos-event-logging-test-helpers.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" @@ -13,7 +13,7 @@ depends: [ "tezos-error-monad" "tezos-event-logging" "tezos-test-helpers" - "alcotest" + "alcotest" { >= "1.1.0" } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_event_logging/tezos-event-logging.opam b/src/lib_event_logging/tezos-event-logging.opam index cd39d1241bfa..5866fa9298b9 100644 --- a/src/lib_event_logging/tezos-event-logging.opam +++ b/src/lib_event_logging/tezos-event-logging.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" @@ -8,9 +8,9 @@ license: "MIT" depends: [ "dune" { >= "2.0" } "tezos-stdlib" - "tezos-lwt-result-stdlib" "data-encoding" { >= "0.4" & < "0.5" } "tezos-error-monad" + "tezos-lwt-result-stdlib" "lwt_log" ] build: [ diff --git a/src/lib_hacl_glue/js/src/dune b/src/lib_hacl_glue/js/src/dune index 8f465e519cda..2691341ea549 100644 --- a/src/lib_hacl_glue/js/src/dune +++ b/src/lib_hacl_glue/js/src/dune @@ -10,7 +10,8 @@ (public_name tezos-hacl-glue-js) (implements tezos-hacl-glue) (instrumentation (backend bisect_ppx)) - (libraries hacl-star-raw-empty) + (libraries + hacl-star-raw-empty) (modules hacl)) (install (section lib) (package tezos-hacl-glue-js) (files hacl_stubs.js)) diff --git a/src/lib_hacl_glue/unix/dune b/src/lib_hacl_glue/unix/dune index 1a213f8b6067..2f2baf57072f 100644 --- a/src/lib_hacl_glue/unix/dune +++ b/src/lib_hacl_glue/unix/dune @@ -3,4 +3,6 @@ (public_name tezos-hacl-glue-unix) (implements tezos-hacl-glue) (instrumentation (backend bisect_ppx)) - (libraries hacl-star hacl-star-raw)) + (libraries + hacl-star + hacl-star-raw)) diff --git a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune index 0e12401519a0..8d41f5c7f46a 100644 --- a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune @@ -2,4 +2,5 @@ (name bare_functor_outputs) (public_name tezos-lwt-result-stdlib.bare.functor-outputs) (instrumentation (backend bisect_ppx)) - (libraries lwt)) + (libraries + lwt)) diff --git a/src/lib_lwt_result_stdlib/bare/sigs/dune b/src/lib_lwt_result_stdlib/bare/sigs/dune index 139807a3990b..33275c6797e5 100644 --- a/src/lib_lwt_result_stdlib/bare/sigs/dune +++ b/src/lib_lwt_result_stdlib/bare/sigs/dune @@ -2,4 +2,6 @@ (name bare_sigs) (public_name tezos-lwt-result-stdlib.bare.sigs) (instrumentation (backend bisect_ppx)) - (libraries lwt tezos-lwt-result-stdlib.bare.functor-outputs)) + (libraries + lwt + tezos-lwt-result-stdlib.bare.functor-outputs)) diff --git a/src/lib_lwt_result_stdlib/bare/structs/dune b/src/lib_lwt_result_stdlib/bare/structs/dune index 2d35c87f8a00..44e325561781 100644 --- a/src/lib_lwt_result_stdlib/bare/structs/dune +++ b/src/lib_lwt_result_stdlib/bare/structs/dune @@ -2,4 +2,6 @@ (name bare_structs) (public_name tezos-lwt-result-stdlib.bare.structs) (instrumentation (backend bisect_ppx)) - (libraries lwt tezos-lwt-result-stdlib.bare.sigs)) + (libraries + lwt + tezos-lwt-result-stdlib.bare.sigs)) diff --git a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune index 299595942cd2..573f5a220814 100644 --- a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune @@ -2,4 +2,6 @@ (name traced_functor_outputs) (public_name tezos-lwt-result-stdlib.traced.functor-outputs) (instrumentation (backend bisect_ppx)) - (libraries lwt tezos-lwt-result-stdlib.bare.sigs)) + (libraries + lwt + tezos-lwt-result-stdlib.bare.sigs)) diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune index a3e3094e34b4..11cdbcf93f75 100644 --- a/src/lib_micheline/dune +++ b/src/lib_micheline/dune @@ -1,20 +1,14 @@ (library (name tezos_micheline) - (instrumentation (backend bisect_ppx)) (public_name tezos-micheline) + (instrumentation (backend bisect_ppx)) (libraries - ;; External uutf zarith - ;; Internal tezos-stdlib tezos-error-monad - data-encoding - ;; test - ppx_inline_test - ) + data-encoding) (inline_tests) (preprocess (pps ppx_inline_test)) - (flags (:standard -open Tezos_stdlib - -open Tezos_error_monad - -open Data_encoding))) + (flags + (:standard -open Tezos_stdlib -open Tezos_error_monad -open Data_encoding))) diff --git a/src/lib_micheline/test/dune b/src/lib_micheline/test/dune index 61bc47341ea3..069a3189afd5 100644 --- a/src/lib_micheline/test/dune +++ b/src/lib_micheline/test/dune @@ -1,6 +1,7 @@ -(tests - (names test_parser) - (libraries tezos-micheline - alcotest-lwt) +(test + (name test_parser) (package tezos-micheline) + (libraries + tezos-micheline + alcotest-lwt) (flags (:standard -open Tezos_micheline))) diff --git a/src/lib_micheline/tezos-micheline.opam b/src/lib_micheline/tezos-micheline.opam index 07506b5066ba..b41ae355e2bf 100644 --- a/src/lib_micheline/tezos-micheline.opam +++ b/src/lib_micheline/tezos-micheline.opam @@ -1,17 +1,19 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "2.0" } - "data-encoding" { >= "0.4" & < "0.5" } - "tezos-error-monad" + "ppx_inline_test" {with-test} "uutf" + "zarith" { < "1.12" } + "tezos-stdlib" + "tezos-error-monad" + "data-encoding" { >= "0.4" & < "0.5" } "alcotest-lwt" { with-test & >= "1.1.0" } - "ppx_inline_test" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune index b17cf5622184..5fa541f5908b 100644 --- a/src/lib_rpc/dune +++ b/src/lib_rpc/dune @@ -2,5 +2,9 @@ (name tezos_rpc) (public_name tezos-rpc) (instrumentation (backend bisect_ppx)) - (libraries data-encoding tezos-error-monad resto resto-directory) + (libraries + data-encoding + tezos-error-monad + resto + resto-directory) (flags (:standard -open Data_encoding -open Tezos_error_monad))) diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune index cdeeff0b81e4..f51de9dd6a6f 100644 --- a/src/lib_stdlib/dune +++ b/src/lib_stdlib/dune @@ -2,6 +2,9 @@ (name tezos_stdlib) (public_name tezos-stdlib) (instrumentation (backend bisect_ppx)) - (libraries hex zarith lwt) + (libraries + hex + zarith + lwt) (inline_tests) (preprocess (pps ppx_inline_test))) diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune index c904a543be9a..0e699efafeaf 100644 --- a/src/lib_stdlib_unix/dune +++ b/src/lib_stdlib_unix/dune @@ -1,22 +1,26 @@ (library (name tezos_stdlib_unix) - (instrumentation (backend bisect_ppx)) (public_name tezos-stdlib-unix) - (flags (:standard -open Tezos_error_monad - -open Tezos_error_monad.TzLwtreslib - -open Tezos_event_logging - -open Tezos_stdlib - -open Data_encoding)) - (libraries data-encoding - tezos-error-monad - tezos-lwt-result-stdlib - tezos-event-logging - tezos-stdlib - lwt.unix - ipaddr.unix - re - ptime - ptime.clock.os - mtime - mtime.clock.os - lwt_log)) + (instrumentation (backend bisect_ppx)) + (libraries + unix + data-encoding + tezos-error-monad + tezos-lwt-result-stdlib + tezos-event-logging + tezos-stdlib + lwt.unix + ipaddr.unix + re + ptime + ptime.clock.os + mtime + mtime.clock.os + lwt_log) + (flags + (:standard + -open Tezos_error_monad + -open Tezos_error_monad.TzLwtreslib + -open Tezos_event_logging + -open Tezos_stdlib + -open Data_encoding))) diff --git a/src/lib_stdlib_unix/tezos-stdlib-unix.opam b/src/lib_stdlib_unix/tezos-stdlib-unix.opam index 6da3c048608b..9d2f0a87ce4b 100644 --- a/src/lib_stdlib_unix/tezos-stdlib-unix.opam +++ b/src/lib_stdlib_unix/tezos-stdlib-unix.opam @@ -1,24 +1,25 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "base-unix" "dune" { >= "2.0" } + "base-unix" "data-encoding" { >= "0.4" & < "0.5" } "tezos-error-monad" "tezos-lwt-result-stdlib" "tezos-event-logging" "tezos-stdlib" + "lwt" { >= "5.4.0" } + "ipaddr" { >= "5.0.0" & < "6.0.0" } "re" { >= "1.7.2" } - "lwt" "ptime" { >= "0.8.4" } "mtime" { >= "1.0.0" } + "lwt_log" "conf-libev" - "ipaddr" { >= "4.0.0" } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_test/dune b/src/lib_test/dune index 1e584957b8ea..54ba264041b9 100644 --- a/src/lib_test/dune +++ b/src/lib_test/dune @@ -2,5 +2,10 @@ (name lib_test) (public_name tezos-test-helpers) (instrumentation (backend bisect_ppx)) - (libraries uri qcheck-alcotest alcotest alcotest-lwt pure-splitmix) + (libraries + uri + qcheck-alcotest + alcotest + alcotest-lwt + pure-splitmix) (flags (:standard -linkall))) diff --git a/src/lib_test/tezos-test-helpers.opam b/src/lib_test/tezos-test-helpers.opam index 02d6e25b38a9..29a3c64505ef 100644 --- a/src/lib_test/tezos-test-helpers.opam +++ b/src/lib_test/tezos-test-helpers.opam @@ -6,12 +6,12 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ + "dune" { >= "2.0" } + "uri" + "qcheck-alcotest" "alcotest" { >= "1.1.0" } "alcotest-lwt" { >= "1.1.0" } - "dune" { >= "2.0" } "pure-splitmix" { = "0.2" } - "qcheck-alcotest" - "uri" ] build: [ ["dune" "build" "-p" name "-j" jobs] -- GitLab