From 55b9e61741f27e0ba169c3c0ae092cde8d8412bd Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Fri, 15 Oct 2021 14:17:59 +0200 Subject: [PATCH] Build: manifest-generated signer, mockup and client command libs --- src/lib_client_commands/dune | 39 +++++----- .../tezos-client-commands.opam | 7 +- src/lib_mockup/dune | 78 ++++++++++--------- src/lib_mockup/test/dune | 19 ++--- src/lib_mockup/tezos-mockup-commands.opam | 2 +- src/lib_mockup/tezos-mockup-registration.opam | 2 +- src/lib_mockup/tezos-mockup.opam | 17 ++-- src/lib_mockup_proxy/dune | 20 +++-- src/lib_mockup_proxy/tezos-mockup-proxy.opam | 4 +- src/lib_signer_backends/dune | 31 ++++---- src/lib_signer_backends/test/dune | 27 ++++--- .../tezos-signer-backends.opam | 14 ++-- src/lib_signer_backends/unix/dune | 43 +++++----- src/lib_signer_backends/unix/test/dune | 22 +++--- src/lib_signer_services/dune | 19 +++-- .../tezos-signer-services.opam | 2 +- 16 files changed, 186 insertions(+), 160 deletions(-) diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index 7c578accf301..8af104eebb96 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -1,21 +1,24 @@ (library (name tezos_client_commands) - (instrumentation (backend bisect_ppx)) (public_name tezos-client-commands) - (libraries tezos-base - tezos-client-base - tezos-clic.unix - tezos-rpc - tezos-shell-services - tezos-p2p-services - tezos-stdlib-unix - tezos-signer-backends - data-encoding) - (library_flags (:standard -linkall)) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_rpc - -open Tezos_clic_unix - -open Tezos_client_base - -open Tezos_shell_services - -open Tezos_p2p_services - -open Data_encoding))) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-client-base + tezos-clic.unix + tezos-rpc + tezos-shell-services + tezos-p2p-services + tezos-stdlib-unix + tezos-signer-backends + data-encoding) + (flags + (:standard + -linkall + -open Tezos_base__TzPervasives + -open Tezos_rpc + -open Tezos_clic_unix + -open Tezos_client_base + -open Tezos_shell_services + -open Tezos_p2p_services + -open Data_encoding))) diff --git a/src/lib_client_commands/tezos-client-commands.opam b/src/lib_client_commands/tezos-client-commands.opam index a99929be8444..6c4ec09a8e25 100644 --- a/src/lib_client_commands/tezos-client-commands.opam +++ b/src/lib_client_commands/tezos-client-commands.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,10 +9,13 @@ depends: [ "dune" { >= "2.0" } "tezos-base" "tezos-client-base" + "tezos-clic" "tezos-rpc" "tezos-shell-services" - "tezos-signer-backends" + "tezos-p2p-services" "tezos-stdlib-unix" + "tezos-signer-backends" + "data-encoding" { >= "0.4" & < "0.5" } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index ee7a358bb225..564a36404d25 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -1,50 +1,56 @@ (library (name tezos_mockup_registration) - (instrumentation (backend bisect_ppx)) (public_name tezos-mockup-registration) - (modules registration registration_intf mockup_args) + (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-client-base - tezos-shell-services - tezos-protocol-environment) - (flags (:standard -open Tezos_base__TzPervasives))) + tezos-base + tezos-client-base + tezos-shell-services + tezos-protocol-environment) + (flags (:standard -open Tezos_base__TzPervasives)) + (modules registration registration_intf mockup_args)) (library (name tezos_mockup) - (instrumentation (backend bisect_ppx)) (public_name tezos-mockup) - (modules files local_services persistence persistence_intf RPC_client migration) + (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix - tezos-client-base - tezos-mockup-proxy - resto-cohttp-self-serving-client - tezos-rpc - tezos-p2p-services - tezos-p2p ; for registering the relevant RPCs - tezos-protocol-environment - tezos-stdlib-unix - tezos-rpc-http - tezos-rpc-http-client - tezos-mockup-registration) - (flags (:standard - -open Tezos_base__TzPervasives - -open Tezos_mockup_registration))) + tezos-base + tezos-base.unix + tezos-client-base + tezos-mockup-proxy + resto-cohttp-self-serving-client + tezos-rpc + tezos-p2p-services + tezos-p2p ; for registering the relevant RPCs + tezos-protocol-environment + tezos-stdlib-unix + tezos-rpc-http + tezos-rpc-http-client + tezos-mockup-registration) + (flags + (:standard -open Tezos_base__TzPervasives -open Tezos_mockup_registration)) + (modules + files + local_services + persistence + persistence_intf + RPC_client + migration)) (library (name tezos_mockup_commands) - (instrumentation (backend bisect_ppx)) (public_name tezos-mockup-commands) - (modules mockup_wallet mockup_commands) + (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-client-commands - tezos-client-base - tezos-mockup - tezos-mockup-registration) - (flags (:standard - -open Tezos_base__TzPervasives - -open Tezos_mockup - -open Tezos_mockup_registration))) + tezos-base + tezos-client-commands + tezos-client-base + tezos-mockup + tezos-mockup-registration) + (flags + (:standard + -open Tezos_base__TzPervasives + -open Tezos_mockup + -open Tezos_mockup_registration)) + (modules mockup_wallet mockup_commands)) diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune index 3699c5b6fd24..e0877cea63f9 100644 --- a/src/lib_mockup/test/dune +++ b/src/lib_mockup/test/dune @@ -1,15 +1,12 @@ (tests - (names - test_mockup_args - test_fuzzing_mockup_args - test_persistence) - (libraries - tezos-base-test-helpers - tezos_mockup - tezos_mockup_registration - tezos-client-base - qcheck-alcotest - alcotest-lwt) + (names test_mockup_args test_fuzzing_mockup_args test_persistence) (package tezos-mockup) + (libraries + tezos-base-test-helpers + tezos-mockup + tezos-mockup-registration + tezos-client-base + qcheck-alcotest + alcotest-lwt) (flags (:standard -open Tezos_base__TzPervasives -open Tezos_base_test_helpers))) diff --git a/src/lib_mockup/tezos-mockup-commands.opam b/src/lib_mockup/tezos-mockup-commands.opam index e0f20e14b7d2..8aee1ea1c68a 100644 --- a/src/lib_mockup/tezos-mockup-commands.opam +++ b/src/lib_mockup/tezos-mockup-commands.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" diff --git a/src/lib_mockup/tezos-mockup-registration.opam b/src/lib_mockup/tezos-mockup-registration.opam index c4c1a7652c1a..a30f18fa10fc 100644 --- a/src/lib_mockup/tezos-mockup-registration.opam +++ b/src/lib_mockup/tezos-mockup-registration.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" diff --git a/src/lib_mockup/tezos-mockup.opam b/src/lib_mockup/tezos-mockup.opam index aa8df409dccb..194281e3d9ec 100644 --- a/src/lib_mockup/tezos-mockup.opam +++ b/src/lib_mockup/tezos-mockup.opam @@ -1,26 +1,27 @@ 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" } - "tezos-stdlib-unix" "tezos-base" "tezos-client-base" + "tezos-mockup-proxy" + "resto-cohttp-self-serving-client" { >= "0.6" & < "0.7" } "tezos-rpc" "tezos-p2p-services" "tezos-p2p" "tezos-protocol-environment" - "tezos-mockup-proxy" + "tezos-stdlib-unix" + "tezos-rpc-http" + "tezos-rpc-http-client" "tezos-mockup-registration" - "tezos-mockup-registration" { with-test } - "qcheck-alcotest" { with-test } - "alcotest-lwt" { with-test } - "tezos-base-test-helpers" { with-test } - "resto-cohttp-self-serving-client" { >= "0.6" & < "0.7" } + "tezos-base-test-helpers" {with-test} + "qcheck-alcotest" {with-test} + "alcotest-lwt" { with-test & >= "1.1.0" } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune index 9b4d48a61b2f..611121e0ad5c 100644 --- a/src/lib_mockup_proxy/dune +++ b/src/lib_mockup_proxy/dune @@ -1,15 +1,13 @@ (library (name tezos_mockup_proxy) - (instrumentation (backend bisect_ppx)) (public_name tezos-mockup-proxy) - (modules RPC_client) + (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-client-base - tezos-protocol-environment - tezos-rpc-http - resto-cohttp-self-serving-client - tezos-rpc-http-client - tezos-shell-services) - (flags (:standard - -open Tezos_base__TzPervasives))) + tezos-base + tezos-client-base + tezos-protocol-environment + tezos-rpc-http + resto-cohttp-self-serving-client + tezos-rpc-http-client + tezos-shell-services) + (flags (:standard -open Tezos_base__TzPervasives))) diff --git a/src/lib_mockup_proxy/tezos-mockup-proxy.opam b/src/lib_mockup_proxy/tezos-mockup-proxy.opam index 77ae9e2a3951..449b41a282d3 100644 --- a/src/lib_mockup_proxy/tezos-mockup-proxy.opam +++ b/src/lib_mockup_proxy/tezos-mockup-proxy.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" @@ -11,9 +11,9 @@ depends: [ "tezos-client-base" "tezos-protocol-environment" "tezos-rpc-http" + "resto-cohttp-self-serving-client" { >= "0.6" & < "0.7" } "tezos-rpc-http-client" "tezos-shell-services" - "resto-cohttp-self-serving-client" { >= "0.6" & < "0.7" } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_signer_backends/dune b/src/lib_signer_backends/dune index cb1c6ceb1fe0..f0cd66a22bc6 100644 --- a/src/lib_signer_backends/dune +++ b/src/lib_signer_backends/dune @@ -1,17 +1,20 @@ (library (name tezos_signer_backends) - (instrumentation (backend bisect_ppx)) (public_name tezos-signer-backends) - (libraries tezos-base - tezos-stdlib - tezos-client-base - tezos-rpc-http-client - tezos-signer-services - tezos-shell-services) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_stdlib - -open Tezos_client_base - -open Tezos_rpc_http - -open Tezos_rpc_http_client - -open Tezos_signer_services - -open Tezos_shell_services))) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-stdlib + tezos-client-base + tezos-rpc-http-client + tezos-signer-services + tezos-shell-services) + (flags + (:standard + -open Tezos_base__TzPervasives + -open Tezos_stdlib + -open Tezos_client_base + -open Tezos_rpc_http + -open Tezos_rpc_http_client + -open Tezos_signer_services + -open Tezos_shell_services))) diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index be3665605056..a6051b020e24 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -1,13 +1,16 @@ -(tests - (names test_encrypted) - (libraries tezos-base - tezos-base.unix - tezos-signer-backends - alcotest-lwt) +(test + (name test_encrypted) (package tezos-signer-backends) - (flags (:standard -open Tezos_error_monad - -open Tezos_stdlib - -open Tezos_error_monad.TzLwtreslib - -open Tezos_crypto - -open Tezos_client_base - -open Tezos_signer_backends))) + (libraries + tezos-base + tezos-base.unix + tezos-signer-backends + alcotest-lwt) + (flags + (:standard + -open Tezos_error_monad + -open Tezos_stdlib + -open Tezos_error_monad.TzLwtreslib + -open Tezos_crypto + -open Tezos_client_base + -open Tezos_signer_backends))) diff --git a/src/lib_signer_backends/tezos-signer-backends.opam b/src/lib_signer_backends/tezos-signer-backends.opam index c9fb609a1c19..0b45e98ff80e 100644 --- a/src/lib_signer_backends/tezos-signer-backends.opam +++ b/src/lib_signer_backends/tezos-signer-backends.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,14 +8,18 @@ license: "MIT" depends: [ "dune" { >= "2.0" } "tezos-base" - "tezos-stdlib-unix" + "tezos-stdlib" "tezos-client-base" - "tezos-rpc-http-client-unix" + "tezos-rpc-http-client" "tezos-signer-services" "tezos-shell-services" + "alcotest-lwt" { with-test & >= "1.1.0" } + "ocplib-endian" + "tezos-stdlib-unix" + "tezos-rpc-http-client-unix" +] +depopts: [ "ledgerwallet-tezos" - "alcotest" {with-test & >= "1.1.0"} - "alcotest-lwt" {with-test & >= "1.1.0"} ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune index e15d1e9560f7..77f2d2f70492 100644 --- a/src/lib_signer_backends/unix/dune +++ b/src/lib_signer_backends/unix/dune @@ -1,23 +1,26 @@ (library (name tezos_signer_backends_unix) - (instrumentation (backend bisect_ppx)) (public_name tezos-signer-backends.unix) - (libraries ocplib-endian.bigstring - tezos-signer-backends - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-rpc-http-client-unix - (select ledger.ml from - (ledgerwallet-tezos -> ledger.available.ml) - (-> ledger.none.ml))) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_stdlib - -open Tezos_client_base - -open Tezos_rpc_http - -open Tezos_rpc_http_client - -open Tezos_rpc_http_client_unix - -open Tezos_signer_services - -open Tezos_signer_backends - -open Tezos_shell_services))) + (instrumentation (backend bisect_ppx)) + (libraries + ocplib-endian.bigstring + tezos-signer-backends + tezos-base + tezos-base.unix + tezos-stdlib-unix + tezos-rpc-http-client-unix + (select ledger.ml from + (ledgerwallet-tezos -> ledger.available.ml) + (-> ledger.none.ml))) + (flags + (:standard + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_stdlib + -open Tezos_client_base + -open Tezos_rpc_http + -open Tezos_rpc_http_client + -open Tezos_rpc_http_client_unix + -open Tezos_signer_services + -open Tezos_signer_backends + -open Tezos_shell_services))) diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune index 0f1afee9fc2e..b8fe7f080e6c 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -1,11 +1,13 @@ -(tests - (names test_crouching) - (libraries tezos-signer-backends.unix - alcotest-lwt) +(test + (name test_crouching) (package tezos-signer-backends) - (flags (:standard -open Tezos_error_monad - -open Tezos_stdlib - -open Tezos_crypto - -open Tezos_client_base - -open Tezos_signer_backends_unix))) - + (libraries + tezos-signer-backends.unix + alcotest-lwt) + (flags + (:standard + -open Tezos_error_monad + -open Tezos_stdlib + -open Tezos_crypto + -open Tezos_client_base + -open Tezos_signer_backends_unix))) diff --git a/src/lib_signer_services/dune b/src/lib_signer_services/dune index 3b8dcff40d1d..a52cc0edae08 100644 --- a/src/lib_signer_services/dune +++ b/src/lib_signer_services/dune @@ -1,11 +1,14 @@ (library (name tezos_signer_services) - (instrumentation (backend bisect_ppx)) (public_name tezos-signer-services) - (libraries tezos-base - tezos-client-base - tezos-rpc) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_rpc - -open Tezos_client_base - -linkall))) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-client-base + tezos-rpc) + (flags + (:standard + -linkall + -open Tezos_base__TzPervasives + -open Tezos_rpc + -open Tezos_client_base))) diff --git a/src/lib_signer_services/tezos-signer-services.opam b/src/lib_signer_services/tezos-signer-services.opam index 4848bb8aeae5..c3e288d9dd08 100644 --- a/src/lib_signer_services/tezos-signer-services.opam +++ b/src/lib_signer_services/tezos-signer-services.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" -- GitLab