From 337eb3269443aac5b476f44561f257973803ba52 Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Mon, 18 Oct 2021 11:56:23 +0200 Subject: [PATCH] Build: manifest-generated miscellaneous small libs and bins --- src/bin_openapi/dune | 7 ++- src/bin_sandbox/dune | 11 ++-- src/bin_signer/dune | 58 ++++++++++--------- src/bin_signer/tezos-signer.opam | 3 +- src/bin_snoop/dune | 50 ++++++++-------- src/bin_snoop/tezos-snoop.opam | 8 +-- src/lib_openapi/dune | 10 ++-- src/lib_openapi/tezos-openapi.opam | 6 +- src/lib_shell_benchmarks/dune | 18 +++--- .../tezos-shell-benchmarks.opam | 2 +- src/tooling/dune | 4 +- src/tooling/tezos-tooling.opam | 11 ++-- src/tooling/tztop/dune | 5 +- 13 files changed, 102 insertions(+), 91 deletions(-) diff --git a/src/bin_openapi/dune b/src/bin_openapi/dune index 26581a364f07..291dab91fbde 100644 --- a/src/bin_openapi/dune +++ b/src/bin_openapi/dune @@ -1,4 +1,5 @@ (executable - (name rpc_openapi) - (instrumentation (backend bisect_ppx)) - (libraries tezos-openapi)) + (name rpc_openapi) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-openapi)) diff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune index ef3f1196e65f..09006e12a38e 100644 --- a/src/bin_sandbox/dune +++ b/src/bin_sandbox/dune @@ -1,5 +1,6 @@ -(executables - (names main) - (libraries tezos-base - tezos-base.unix - flextesa)) +(executable + (name main) + (libraries + tezos-base + tezos-base.unix + flextesa)) diff --git a/src/bin_signer/dune b/src/bin_signer/dune index f9aef8a3659a..8528f6c04312 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -1,30 +1,32 @@ -; build static executable with --profile static (env - (static (flags (:standard - -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) -(executables - (names main_signer) - (instrumentation (backend bisect_ppx)) - (public_names tezos-signer) + (static + (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) + +(executable + (name main_signer) + (public_name tezos-signer) (package tezos-signer) - (libraries tezos-base - tezos-base.unix - tezos-client-base - tezos-client-base-unix - tezos-client-commands - tezos-signer-services - tezos-rpc-http-server - tezos-rpc-http-client-unix - tezos-stdlib-unix - tezos-signer-backends.unix) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_client_base - -open Tezos_client_base_unix - -open Tezos_client_commands - -open Tezos_signer_services - -open Tezos_rpc_http - -open Tezos_rpc_http_server - -open Tezos_rpc_http_client_unix - -open Tezos_stdlib_unix - -open Tezos_stdlib))) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-base.unix + tezos-client-base + tezos-client-base-unix + tezos-client-commands + tezos-signer-services + tezos-rpc-http-server + tezos-rpc-http-client-unix + tezos-stdlib-unix + tezos-signer-backends.unix) + (flags + (:standard + -open Tezos_base__TzPervasives + -open Tezos_client_base + -open Tezos_client_base_unix + -open Tezos_client_commands + -open Tezos_signer_services + -open Tezos_rpc_http + -open Tezos_rpc_http_server + -open Tezos_rpc_http_client_unix + -open Tezos_stdlib_unix + -open Tezos_stdlib))) diff --git a/src/bin_signer/tezos-signer.opam b/src/bin_signer/tezos-signer.opam index 4e0657b5ccf9..6721108eb6f9 100644 --- a/src/bin_signer/tezos-signer.opam +++ b/src/bin_signer/tezos-signer.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,6 +13,7 @@ depends: [ "tezos-client-commands" "tezos-signer-services" "tezos-rpc-http-server" + "tezos-rpc-http-client-unix" "tezos-stdlib-unix" "tezos-signer-backends" ] diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index d88145fc8230..7bb60282b830 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -1,27 +1,27 @@ +(env (static (flags (:standard -ccopt -static)))) -; build static executable with --profile static -(env - (static (flags (:standard -ccopt -static )))) - -(executables - (names main_snoop) - (instrumentation (backend bisect_ppx)) - (public_names tezos-snoop) +(executable + (name main_snoop) + (public_name tezos-snoop) (package tezos-snoop) - (libraries tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-clic - tezos-benchmark - tezos-benchmark-examples - tezos-shell-benchmarks - tezos-benchmarks-proto-alpha - str - ocamlgraph - pyml - pyml-plot - prbnmcn-stats) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_benchmark - -linkall))) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-base.unix + tezos-stdlib-unix + tezos-clic + tezos-benchmark + tezos-benchmark-examples + tezos-shell-benchmarks + tezos-benchmarks-proto-alpha + str + ocamlgraph + pyml + pyml-plot + prbnmcn-stats) + (flags + (:standard + -linkall + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_benchmark))) diff --git a/src/bin_snoop/tezos-snoop.opam b/src/bin_snoop/tezos-snoop.opam index 14aa2c344807..5627b0cf6fa6 100644 --- a/src/bin_snoop/tezos-snoop.opam +++ b/src/bin_snoop/tezos-snoop.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,15 +8,15 @@ license: "MIT" depends: [ "dune" { >= "2.0" } "tezos-base" + "tezos-stdlib-unix" + "tezos-clic" "tezos-benchmark" "tezos-benchmark-examples" "tezos-shell-benchmarks" "tezos-benchmarks-proto-alpha" - "tezos-stdlib-unix" - "tezos-clic" + "ocamlgraph" "pyml" "pyml-plot" - "ocamlgraph" "prbnmcn-stats" { = "0.0.2" } ] build: [ diff --git a/src/lib_openapi/dune b/src/lib_openapi/dune index a251ad1dfe97..a5bd4cad943e 100644 --- a/src/lib_openapi/dune +++ b/src/lib_openapi/dune @@ -1,5 +1,7 @@ (library - (name tezos_openapi) - (instrumentation (backend bisect_ppx)) - (public_name tezos-openapi) - (libraries ezjsonm json-data-encoding)) + (name tezos_openapi) + (public_name tezos-openapi) + (instrumentation (backend bisect_ppx)) + (libraries + ezjsonm + json-data-encoding)) diff --git a/src/lib_openapi/tezos-openapi.opam b/src/lib_openapi/tezos-openapi.opam index 62a0fec741d8..ef74571232f8 100644 --- a/src/lib_openapi/tezos-openapi.opam +++ b/src/lib_openapi/tezos-openapi.opam @@ -1,17 +1,17 @@ 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" } - "ezjsonm" + "ezjsonm" { >= "0.5.0" } "json-data-encoding" ] build: [ ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] { with-test } + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] synopsis: "Tezos: a library for querying RPCs and converting into the OpenAPI format" diff --git a/src/lib_shell_benchmarks/dune b/src/lib_shell_benchmarks/dune index f19a8bd24b45..55997cdec1cb 100644 --- a/src/lib_shell_benchmarks/dune +++ b/src/lib_shell_benchmarks/dune @@ -1,17 +1,19 @@ (library (name tezos_shell_benchmarks) - (instrumentation (backend bisect_ppx)) (public_name tezos-shell-benchmarks) + (instrumentation (backend bisect_ppx)) (libraries tezos-base tezos-benchmark tezos-context tezos-shell-context tezos-micheline) - (library_flags (:standard -linkall)) - (flags (:standard -open Tezos_stdlib - -open Tezos_base - -open Tezos_base__TzPervasives - -open Tezos_error_monad - -open Tezos_benchmark - -open Tezos_crypto))) + (flags + (:standard + -linkall + -open Tezos_stdlib + -open Tezos_base + -open Tezos_base__TzPervasives + -open Tezos_error_monad + -open Tezos_benchmark + -open Tezos_crypto))) diff --git a/src/lib_shell_benchmarks/tezos-shell-benchmarks.opam b/src/lib_shell_benchmarks/tezos-shell-benchmarks.opam index e37688ba377d..5475e74f67a7 100644 --- a/src/lib_shell_benchmarks/tezos-shell-benchmarks.opam +++ b/src/lib_shell_benchmarks/tezos-shell-benchmarks.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/tooling/dune b/src/tooling/dune index b019d488d230..3bf59da3e184 100644 --- a/src/tooling/dune +++ b/src/tooling/dune @@ -1,7 +1,7 @@ (library (name tezos_tooling) - (instrumentation (backend bisect_ppx)) - (public_name tezos-tooling)) + (public_name tezos-tooling) + (instrumentation (backend bisect_ppx))) (install (package tezos-tooling) diff --git a/src/tooling/tezos-tooling.opam b/src/tooling/tezos-tooling.opam index 948de8d72a35..6e12bd0e2548 100644 --- a/src/tooling/tezos-tooling.opam +++ b/src/tooling/tezos-tooling.opam @@ -1,20 +1,23 @@ 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: [ - "coq-of-ocaml" { = "2.5.0" } "dune" { >= "2.0" } + "coq-of-ocaml" { = "2.5.0" } "ocamlformat" { = "0.18.0" } "bisect_ppx" { >= "2.3" } - "tezos-base" "tezos-protocol-compiler" + "tezos-base" +] +depopts: [ + "utop" { >= "2.8" } ] build: [ ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -depopts: [ "utop" { >= "2.8" } ] synopsis: "Tezos: tooling for the project" diff --git a/src/tooling/tztop/dune b/src/tooling/tztop/dune index 6f18fd78a5cd..6868f3fdd41d 100644 --- a/src/tooling/tztop/dune +++ b/src/tooling/tztop/dune @@ -1,14 +1,13 @@ (executable (name tztop_main) (public_name tztop) + (package tezos-tooling) (modes byte) (libraries tezos-protocol-compiler tezos-base compiler-libs.toplevel - (select tztop.ml from - (utop -> tztop.utop.ml) - (-> tztop.vanilla.ml)))) + (select tztop.ml from (utop -> tztop.utop.ml) (-> tztop.vanilla.ml)))) ; We use Dune's select statement and keep uTop optional ; Keeping uTop optional lets `make build` succeed, -- GitLab