From 179f9231824abef6fa2e75b38860911e1b04dee8 Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Fri, 15 Oct 2021 17:21:11 +0200 Subject: [PATCH] Build: manifest-generated proxy libs, lib_client_base_unix, lib_benchmark --- src/lib_benchmark/dune | 26 +++++----- src/lib_benchmark/example/dune | 13 ++--- .../lib_micheline_rewriting/dune | 12 ++--- .../lib_micheline_rewriting/test/dune | 17 +++---- .../tezos-micheline-rewriting.opam | 20 ++++---- src/lib_benchmark/test/dune | 21 +++++---- .../tezos-benchmark-examples.opam | 6 ++- src/lib_benchmark/tezos-benchmark-tests.opam | 14 +++--- src/lib_benchmark/tezos-benchmark.opam | 5 +- src/lib_client_base_unix/dune | 47 ++++++++++--------- src/lib_client_base_unix/test/dune | 12 +++-- .../tezos-client-base-unix.opam | 14 ++++-- src/lib_proxy/dune | 5 +- src/lib_proxy/test/dune | 3 +- src/lib_proxy/tezos-proxy.opam | 13 ++--- src/lib_proxy_server_config/dune | 10 ++-- src/lib_proxy_server_config/test/dune | 7 ++- .../tezos-proxy-server-config.opam | 8 ++-- 18 files changed, 131 insertions(+), 122 deletions(-) diff --git a/src/lib_benchmark/dune b/src/lib_benchmark/dune index b4178e1ceac4..21f20923aad8 100644 --- a/src/lib_benchmark/dune +++ b/src/lib_benchmark/dune @@ -1,17 +1,15 @@ (library (name tezos_benchmark) - (instrumentation (backend bisect_ppx)) (public_name tezos-benchmark) - (libraries tezos-base - tezos-stdlib-unix - tezos-micheline - tezos-clic - data-encoding - prbnmcn-stats - benchmark-utils - pyml-plot ;; because of Matrix module... pyml-plot should be split further - ocaml-migrate-parsetree - ) - (flags (:standard - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix))) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-stdlib-unix + tezos-micheline + tezos-clic + data-encoding + prbnmcn-stats + benchmark-utils + pyml-plot ;; because of Matrix module... pyml-plot should be split further + ocaml-migrate-parsetree) + (flags (:standard -open Tezos_base__TzPervasives -open Tezos_stdlib_unix))) diff --git a/src/lib_benchmark/example/dune b/src/lib_benchmark/example/dune index 60e8233bd723..c69008520f53 100644 --- a/src/lib_benchmark/example/dune +++ b/src/lib_benchmark/example/dune @@ -1,9 +1,10 @@ (library (name tezos_benchmark_examples) - (instrumentation (backend bisect_ppx)) (public_name tezos-benchmark-examples) - (libraries tezos-base - tezos-stdlib-unix - tezos-crypto - tezos-benchmark) - (flags (:standard -open Tezos_base__TzPervasives))) \ No newline at end of file + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-stdlib-unix + tezos-crypto + tezos-benchmark) + (flags (:standard -open Tezos_base__TzPervasives))) diff --git a/src/lib_benchmark/lib_micheline_rewriting/dune b/src/lib_benchmark/lib_micheline_rewriting/dune index 9141444e991a..200b93717c15 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/dune @@ -1,15 +1,11 @@ (library (name tezos_micheline_rewriting) - (instrumentation (backend bisect_ppx)) (public_name tezos-micheline-rewriting) + (instrumentation (backend bisect_ppx)) (libraries - ;; External zarith - ;; Internal tezos-stdlib tezos-error-monad - tezos-micheline - ) - (flags (:standard -open Tezos_stdlib - -open Tezos_error_monad - -open Tezos_micheline))) + tezos-micheline) + (flags + (:standard -open Tezos_stdlib -open Tezos_error_monad -open Tezos_micheline))) diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune index fec4555bd25f..f26d36e74f57 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/test/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune @@ -1,10 +1,11 @@ -(tests - (names test_rewriting) - (libraries tezos-micheline - tezos-micheline-rewriting - tezos-protocol-alpha - tezos-error-monad - tezos-client-alpha - alcotest-lwt) +(test + (name test_rewriting) (package tezos-micheline-rewriting) + (libraries + tezos-micheline + tezos-micheline-rewriting + tezos-protocol-alpha + tezos-error-monad + tezos-client-alpha + alcotest-lwt) (flags (:standard -open Tezos_micheline))) diff --git a/src/lib_benchmark/lib_micheline_rewriting/tezos-micheline-rewriting.opam b/src/lib_benchmark/lib_micheline_rewriting/tezos-micheline-rewriting.opam index 8c07b9d6f6d2..d534579a2b30 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/tezos-micheline-rewriting.opam +++ b/src/lib_benchmark/lib_micheline_rewriting/tezos-micheline-rewriting.opam @@ -1,22 +1,22 @@ opam-version: "2.0" -name: "tezos-micheline-rewriting" -version: "1.0" -authors: [ "Tezos devteam" ] maintainer: "contact@tezos.com" -license: "MIT" +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" -build: [[ "dune" "build" "-j" jobs "-p" name "@install" ]] -run-test: [[ "dune" "runtest" "-p" name "-j" jobs ]] +license: "MIT" depends: [ - "dune" {build & >= "2.0"} - "tezos-micheline" + "dune" { >= "2.0" } "zarith" { >= "1.12" & < "1.13" } "tezos-stdlib" "tezos-error-monad" - "alcotest-lwt" {with-test} - "tezos-client-alpha" {with-test} + "tezos-micheline" "tezos-protocol-alpha" {with-test} + "tezos-client-alpha" {with-test} + "alcotest-lwt" { with-test & >= "1.1.0" } +] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] synopsis: "Tezos: library for rewriting Micheline expressions" diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune index 07ffdd13aa91..0f290e042206 100644 --- a/src/lib_benchmark/test/dune +++ b/src/lib_benchmark/test/dune @@ -1,12 +1,13 @@ -(tests - (names main_ci) - (libraries alcotest-lwt - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-micheline - tezos-crypto - tezos-benchmark - tezos-benchmark-examples) +(test + (name main_ci) (package tezos-benchmark-tests) + (libraries + alcotest-lwt + tezos-base + tezos-base.unix + tezos-stdlib-unix + tezos-micheline + tezos-crypto + tezos-benchmark + tezos-benchmark-examples) (flags (:standard -open Tezos_base__TzPervasives))) diff --git a/src/lib_benchmark/tezos-benchmark-examples.opam b/src/lib_benchmark/tezos-benchmark-examples.opam index 398f8911cca6..cfe31d8f0e98 100644 --- a/src/lib_benchmark/tezos-benchmark-examples.opam +++ b/src/lib_benchmark/tezos-benchmark-examples.opam @@ -1,14 +1,16 @@ 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-base" + "tezos-stdlib-unix" + "tezos-crypto" "tezos-benchmark" - "alcotest-lwt" { with-test & >= "1.1.0" } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_benchmark/tezos-benchmark-tests.opam b/src/lib_benchmark/tezos-benchmark-tests.opam index 46b044befded..f0ec446d1162 100644 --- a/src/lib_benchmark/tezos-benchmark-tests.opam +++ b/src/lib_benchmark/tezos-benchmark-tests.opam @@ -1,19 +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" } - "tezos-benchmark" - "tezos-benchmark-examples" - "tezos-stdlib-unix" - "tezos-micheline" - "tezos-crypto" - "tezos-base" "alcotest-lwt" { with-test & >= "1.1.0" } + "tezos-base" {with-test} + "tezos-stdlib-unix" {with-test} + "tezos-micheline" {with-test} + "tezos-crypto" {with-test} + "tezos-benchmark" {with-test} + "tezos-benchmark-examples" {with-test} ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_benchmark/tezos-benchmark.opam b/src/lib_benchmark/tezos-benchmark.opam index aa1ad7beeaab..ab2db9bb1035 100644 --- a/src/lib_benchmark/tezos-benchmark.opam +++ b/src/lib_benchmark/tezos-benchmark.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,7 +8,6 @@ license: "MIT" depends: [ "dune" { >= "2.0" } "tezos-base" - "tezos-stdlib" "tezos-stdlib-unix" "tezos-micheline" "tezos-clic" @@ -16,9 +15,9 @@ depends: [ "prbnmcn-stats" { = "0.0.2" } "benchmark-utils" "pyml-plot" + "ocaml-migrate-parsetree" "conf-autoconf" "hashcons" - "ocaml-migrate-parsetree" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index e54ea591ffd0..3f71cc580ce6 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -1,25 +1,28 @@ (library (name tezos_client_base_unix) - (instrumentation (backend bisect_ppx)) (public_name tezos-client-base-unix) - (libraries tezos-base - tezos-client-base - tezos-client-commands - tezos-stdlib-unix - tezos-rpc-http-client-unix - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-proxy - tezos-signer-backends.unix - tezos-shell-services - lwt-exit) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_rpc_http - -open Tezos_rpc_http_client_unix - -open Tezos_shell_services - -open Tezos_stdlib_unix - -open Tezos_client_base - -open Tezos_client_commands - -open Tezos_mockup_commands - -linkall))) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-client-base + tezos-client-commands + tezos-stdlib-unix + tezos-rpc-http-client-unix + tezos-mockup + tezos-mockup-registration + tezos-mockup-commands + tezos-proxy + tezos-signer-backends.unix + tezos-shell-services + lwt-exit) + (flags + (:standard + -linkall + -open Tezos_base__TzPervasives + -open Tezos_rpc_http + -open Tezos_rpc_http_client_unix + -open Tezos_shell_services + -open Tezos_stdlib_unix + -open Tezos_client_base + -open Tezos_client_commands + -open Tezos_mockup_commands))) diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune index 2fcc103a1839..1f1bc0241178 100644 --- a/src/lib_client_base_unix/test/dune +++ b/src/lib_client_base_unix/test/dune @@ -1,7 +1,11 @@ -(tests - (names test_mockup_wallet) - (libraries tezos-mockup-commands tezos-client-base-unix tezos-base-test-helpers - alcotest alcotest-lwt) +(test + (name test_mockup_wallet) (package tezos-client-base-unix) + (libraries + tezos-mockup-commands + tezos-client-base-unix + tezos-base-test-helpers + alcotest + alcotest-lwt) (flags (:standard -open Tezos_base__TzPervasives -open Tezos_base_test_helpers))) diff --git a/src/lib_client_base_unix/tezos-client-base-unix.opam b/src/lib_client_base_unix/tezos-client-base-unix.opam index cabefc415c1a..15ba0c18cefe 100644 --- a/src/lib_client_base_unix/tezos-client-base-unix.opam +++ b/src/lib_client_base_unix/tezos-client-base-unix.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,15 +9,19 @@ depends: [ "dune" { >= "2.0" } "tezos-base" "tezos-client-base" - "tezos-stdlib-unix" - "tezos-rpc-http-client" - "tezos-signer-backends" "tezos-client-commands" + "tezos-stdlib-unix" + "tezos-rpc-http-client-unix" + "tezos-mockup" "tezos-mockup-registration" "tezos-mockup-commands" "tezos-proxy" + "tezos-signer-backends" + "tezos-shell-services" "lwt-exit" - "tezos-base-test-helpers" { with-test } + "tezos-base-test-helpers" {with-test} + "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_proxy/dune b/src/lib_proxy/dune index d3b8afeda01e..fb7b8b47e643 100644 --- a/src/lib_proxy/dune +++ b/src/lib_proxy/dune @@ -1,7 +1,7 @@ (library (name tezos_proxy) - (instrumentation (backend bisect_ppx)) (public_name tezos-proxy) + (instrumentation (backend bisect_ppx)) (libraries ringo-lwt tezos-base @@ -12,5 +12,4 @@ tezos-rpc tezos-shell-services tezos-context) - (flags - (:standard -open Tezos_base__TzPervasives))) + (flags (:standard -open Tezos_base__TzPervasives))) diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index ade1c2018101..cbe5d613face 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -12,5 +12,4 @@ qcheck-alcotest alcotest-lwt) (flags - (:standard -open Tezos_base__TzPervasives - -open Tezos_base_test_helpers))) + (:standard -open Tezos_base__TzPervasives -open Tezos_base_test_helpers))) diff --git a/src/lib_proxy/tezos-proxy.opam b/src/lib_proxy/tezos-proxy.opam index 472343728fb9..ec48139a9c45 100644 --- a/src/lib_proxy/tezos-proxy.opam +++ b/src/lib_proxy/tezos-proxy.opam @@ -1,13 +1,13 @@ 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" } - "ringo-lwt" + "ringo-lwt" { = "0.5" } "tezos-base" "tezos-clic" "tezos-client-base" @@ -16,11 +16,12 @@ depends: [ "tezos-rpc" "tezos-shell-services" "tezos-context" + "tezos-stdlib-unix" {with-test} + "tezos-base-test-helpers" {with-test} + "tezos-test-helpers" {with-test} + "tezos-shell-services-test-helpers" {with-test} + "qcheck-alcotest" {with-test} "alcotest-lwt" { with-test & >= "1.1.0" } - "tezos-test-helpers" { with-test } - "tezos-base-test-helpers" { with-test } - "tezos-shell-services-test-helpers" { with-test } - "qcheck-alcotest" { with-test } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_proxy_server_config/dune b/src/lib_proxy_server_config/dune index c6511b58eb59..b4e95bc6efb2 100644 --- a/src/lib_proxy_server_config/dune +++ b/src/lib_proxy_server_config/dune @@ -1,8 +1,8 @@ (library (name tezos_proxy_server_config) - (instrumentation (backend bisect_ppx)) (public_name tezos-proxy-server-config) - (libraries tezos-base - tezos-stdlib-unix) - (flags - (:standard -open Tezos_base__TzPervasives))) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-stdlib-unix) + (flags (:standard -open Tezos_base__TzPervasives))) diff --git a/src/lib_proxy_server_config/test/dune b/src/lib_proxy_server_config/test/dune index baf00557ef1f..8fa9be66fd9a 100644 --- a/src/lib_proxy_server_config/test/dune +++ b/src/lib_proxy_server_config/test/dune @@ -1,5 +1,5 @@ -(tests - (names test_proxy_server_config) +(test + (name test_proxy_server_config) (package tezos-proxy-server-config) (libraries tezos-base @@ -8,5 +8,4 @@ tezos-test-helpers qcheck-alcotest alcotest-lwt) - (flags - (:standard -open Tezos_base__TzPervasives))) + (flags (:standard -open Tezos_base__TzPervasives))) diff --git a/src/lib_proxy_server_config/tezos-proxy-server-config.opam b/src/lib_proxy_server_config/tezos-proxy-server-config.opam index ced82f5ab1e0..81366176f689 100644 --- a/src/lib_proxy_server_config/tezos-proxy-server-config.opam +++ b/src/lib_proxy_server_config/tezos-proxy-server-config.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,8 +8,10 @@ license: "MIT" depends: [ "dune" { >= "2.0" } "tezos-base" - "tezos-test-helpers" { with-test } - "qcheck-alcotest" { with-test } + "tezos-stdlib-unix" + "tezos-test-helpers" {with-test} + "qcheck-alcotest" {with-test} + "alcotest-lwt" { with-test & >= "1.1.0" } ] build: [ ["dune" "build" "-p" name "-j" jobs] -- GitLab