From 9ab7e2468af7f3fb9d1dc7ad328f936b4dd8f6a2 Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Mon, 29 Nov 2021 10:51:40 +0100 Subject: [PATCH] Build: manifest-generated miscellaneous --- src/bin_client/dune | 3 +- src/bin_codec/dune | 3 +- src/bin_node/dune | 4 +- src/bin_openapi/dune | 3 -- src/bin_proxy_server/dune | 7 +-- src/bin_sandbox/dune | 3 -- src/bin_snoop/dune | 4 +- src/bin_validation/dune | 3 +- src/lib_error_monad/test/dune | 9 ++-- src/lib_error_monad/tezos-error-monad.opam | 2 +- .../bare/functor_outputs/dune | 4 +- src/lib_lwt_result_stdlib/bare/sigs/dune | 4 +- src/lib_lwt_result_stdlib/bare/structs/dune | 4 +- src/lib_lwt_result_stdlib/dune | 4 +- .../traced/functor_outputs/dune | 4 +- src/lib_lwt_result_stdlib/traced/sigs/dune | 4 +- src/lib_lwt_result_stdlib/traced/structs/dune | 4 +- src/lib_micheline/dune | 2 +- src/lib_micheline/test/dune | 8 ++-- src/lib_micheline/tezos-micheline.opam | 2 +- src/lib_protocol_compiler/dune | 4 +- .../tezos-signer-backends.opam | 2 +- src/lib_stdlib/dune | 4 +- src/lib_stdlib/test-unix/dune | 5 +-- src/lib_stdlib/test/dune | 43 +++++++++++-------- src/lib_stdlib/tezos-stdlib.opam | 4 +- src/lib_test/dune | 4 +- src/lib_test/tezos-test-helpers.opam | 2 +- src/tooling/dune | 12 +++--- src/tooling/tezos-tooling.opam | 2 + 30 files changed, 74 insertions(+), 89 deletions(-) diff --git a/src/bin_client/dune b/src/bin_client/dune index ed3a09d1139b..ec9b8c5a5db9 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -6,8 +6,7 @@ (static (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) (ocamlopt_flags (:standard -O3))) - (release - (ocamlopt_flags (:standard -O3)))) + (release (ocamlopt_flags (:standard -O3)))) (executables (names main_client main_admin) diff --git a/src/bin_codec/dune b/src/bin_codec/dune index e3b38d3d45cf..202b3cdfd95c 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -2,8 +2,7 @@ (static (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) (ocamlopt_flags (:standard -O3))) - (release - (ocamlopt_flags (:standard -O3)))) + (release (ocamlopt_flags (:standard -O3)))) (executable (name codec) diff --git a/src/bin_node/dune b/src/bin_node/dune index ddfad5635067..92ec6d879d47 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -8,9 +8,7 @@ ; "void_for_linking". (env - (static - (flags (:standard -ccopt -static)) - (ocamlopt_flags (:standard -O3))) + (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3))) (release (ocamlopt_flags (:standard -O3)))) (executable diff --git a/src/bin_openapi/dune b/src/bin_openapi/dune index be174c53f87a..291dab91fbde 100644 --- a/src/bin_openapi/dune +++ b/src/bin_openapi/dune @@ -1,6 +1,3 @@ -(env - (release (ocamlopt_flags (:standard -O3)))) - (executable (name rpc_openapi) (instrumentation (backend bisect_ppx)) diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index ff30b43ab7fa..f23a17bb14ed 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -3,11 +3,8 @@ ; dependencies. (env - (static - (flags (:standard -ccopt -static)) - (ocamlopt_flags (:standard -O3))) - (release - (ocamlopt_flags (:standard -O3)))) + (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3))) + (release (ocamlopt_flags (:standard -O3)))) (executable (name main_proxy_server) diff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune index 7524ab788e0e..90d65b78acf1 100644 --- a/src/bin_sandbox/dune +++ b/src/bin_sandbox/dune @@ -1,6 +1,3 @@ -(env - (release (ocamlopt_flags (:standard -O3)))) - (executable (name main) (libraries diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index ccb6f2453794..50f07cf6de35 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -1,7 +1,5 @@ (env - (static - (flags (:standard -ccopt -static)) - (ocamlopt_flags (:standard -O3))) + (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3))) (release (ocamlopt_flags (:standard -O3)))) (executable diff --git a/src/bin_validation/dune b/src/bin_validation/dune index e7dd39d32272..2325afda57bc 100644 --- a/src/bin_validation/dune +++ b/src/bin_validation/dune @@ -1,5 +1,4 @@ -(env - (release (ocamlopt_flags (:standard -O3)))) +(env (release (ocamlopt_flags (:standard -O3)))) (library (name tezos_validator) diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune index 447c15536b08..f7e1ac8c51a6 100644 --- a/src/lib_error_monad/test/dune +++ b/src/lib_error_monad/test/dune @@ -1,15 +1,14 @@ (test (name test_registration) (package tezos-error-monad) + (modes native js) (libraries tezos-error-monad data-encoding alcotest) - (modes native js) (flags (:standard -open Tezos_error_monad))) - (rule - (alias runtest_js) - (package tezos-error-monad) - (action (run node %{dep:./test_registration.bc.js}))) + (alias runtest_js) + (package tezos-error-monad) + (action (run node %{dep:./test_registration.bc.js}))) diff --git a/src/lib_error_monad/tezos-error-monad.opam b/src/lib_error_monad/tezos-error-monad.opam index f48ccbd98592..ec61428be751 100644 --- a/src/lib_error_monad/tezos-error-monad.opam +++ b/src/lib_error_monad/tezos-error-monad.opam @@ -13,7 +13,7 @@ depends: [ "lwt-canceler" { >= "0.3" & < "0.4" } "lwt" { >= "5.4.0" } "tezos-lwt-result-stdlib" - "alcotest-lwt" { with-test & >= "1.5.0" } + "alcotest" { with-test & >= "1.5.0" } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune index 357ae36d7013..27aaae2c2040 100644 --- a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune @@ -2,6 +2,6 @@ (name bare_functor_outputs) (public_name tezos-lwt-result-stdlib.bare.functor-outputs) (instrumentation (backend bisect_ppx)) - (js_of_ocaml) (libraries - lwt)) + lwt) + (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/bare/sigs/dune b/src/lib_lwt_result_stdlib/bare/sigs/dune index e3830be3c1d3..ca9c18edc371 100644 --- a/src/lib_lwt_result_stdlib/bare/sigs/dune +++ b/src/lib_lwt_result_stdlib/bare/sigs/dune @@ -2,7 +2,7 @@ (name bare_sigs) (public_name tezos-lwt-result-stdlib.bare.sigs) (instrumentation (backend bisect_ppx)) - (js_of_ocaml) (libraries lwt - tezos-lwt-result-stdlib.bare.functor-outputs)) + tezos-lwt-result-stdlib.bare.functor-outputs) + (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/bare/structs/dune b/src/lib_lwt_result_stdlib/bare/structs/dune index 0912602bedea..f5807a4ecdd4 100644 --- a/src/lib_lwt_result_stdlib/bare/structs/dune +++ b/src/lib_lwt_result_stdlib/bare/structs/dune @@ -2,7 +2,7 @@ (name bare_structs) (public_name tezos-lwt-result-stdlib.bare.structs) (instrumentation (backend bisect_ppx)) - (js_of_ocaml) (libraries lwt - tezos-lwt-result-stdlib.bare.sigs)) + tezos-lwt-result-stdlib.bare.sigs) + (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/dune b/src/lib_lwt_result_stdlib/dune index 52148d607180..cfecba19107f 100644 --- a/src/lib_lwt_result_stdlib/dune +++ b/src/lib_lwt_result_stdlib/dune @@ -2,10 +2,10 @@ (name tezos_lwt_result_stdlib) (public_name tezos-lwt-result-stdlib) (instrumentation (backend bisect_ppx)) - (js_of_ocaml) (libraries lwt tezos-lwt-result-stdlib.bare.sigs tezos-lwt-result-stdlib.bare.structs tezos-lwt-result-stdlib.traced.sigs - tezos-lwt-result-stdlib.traced.structs)) + tezos-lwt-result-stdlib.traced.structs) + (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune index 8d130bb70f17..ce98aaecab8e 100644 --- a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune @@ -2,7 +2,7 @@ (name traced_functor_outputs) (public_name tezos-lwt-result-stdlib.traced.functor-outputs) (instrumentation (backend bisect_ppx)) - (js_of_ocaml) (libraries lwt - tezos-lwt-result-stdlib.bare.sigs)) + tezos-lwt-result-stdlib.bare.sigs) + (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/traced/sigs/dune b/src/lib_lwt_result_stdlib/traced/sigs/dune index 54fcaaaf2935..5e8d81ef3504 100644 --- a/src/lib_lwt_result_stdlib/traced/sigs/dune +++ b/src/lib_lwt_result_stdlib/traced/sigs/dune @@ -2,9 +2,9 @@ (name traced_sigs) (public_name tezos-lwt-result-stdlib.traced.sigs) (instrumentation (backend bisect_ppx)) - (js_of_ocaml) (libraries lwt tezos-lwt-result-stdlib.bare.sigs tezos-lwt-result-stdlib.bare.structs - tezos-lwt-result-stdlib.traced.functor-outputs)) + tezos-lwt-result-stdlib.traced.functor-outputs) + (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/traced/structs/dune b/src/lib_lwt_result_stdlib/traced/structs/dune index 155ec5d236e3..bd14281ef1e3 100644 --- a/src/lib_lwt_result_stdlib/traced/structs/dune +++ b/src/lib_lwt_result_stdlib/traced/structs/dune @@ -2,8 +2,8 @@ (name traced_structs) (public_name tezos-lwt-result-stdlib.traced.structs) (instrumentation (backend bisect_ppx)) - (js_of_ocaml) (libraries lwt tezos-lwt-result-stdlib.traced.sigs - tezos-lwt-result-stdlib.bare.structs)) + tezos-lwt-result-stdlib.bare.structs) + (js_of_ocaml)) diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune index d82d6d12aaba..e14ce2900185 100644 --- a/src/lib_micheline/dune +++ b/src/lib_micheline/dune @@ -9,8 +9,8 @@ tezos-stdlib tezos-error-monad data-encoding) - (js_of_ocaml) (inline_tests) (preprocess (pps ppx_inline_test)) + (js_of_ocaml) (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 924254e69049..b8a0212c00ff 100644 --- a/src/lib_micheline/test/dune +++ b/src/lib_micheline/test/dune @@ -1,13 +1,13 @@ (test (name test_parser) (package tezos-micheline) + (modes native js) (libraries tezos-micheline alcotest) - (modes native js) (flags (:standard -open Tezos_micheline))) (rule - (alias runtest_js) - (package tezos-micheline) - (action (run node %{dep:./test_parser.bc.js}))) + (alias runtest_js) + (package tezos-micheline) + (action (run node %{dep:./test_parser.bc.js}))) diff --git a/src/lib_micheline/tezos-micheline.opam b/src/lib_micheline/tezos-micheline.opam index e986754f3058..1469c9d623c9 100644 --- a/src/lib_micheline/tezos-micheline.opam +++ b/src/lib_micheline/tezos-micheline.opam @@ -14,7 +14,7 @@ depends: [ "tezos-stdlib" "tezos-error-monad" "data-encoding" { >= "0.4" & < "0.5" } - "alcotest-lwt" { with-test & >= "1.5.0" } + "alcotest" { with-test & >= "1.5.0" } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index 127a73e537f1..5d87016100db 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -1,8 +1,6 @@ ; build static executable with --profile static (env - (static - (flags (:standard -ccopt -static)) - (ocamlopt_flags (:standard -O3))) + (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3))) (release (ocamlopt_flags (:standard -O3)))) (library diff --git a/src/lib_signer_backends/tezos-signer-backends.opam b/src/lib_signer_backends/tezos-signer-backends.opam index d63f3598f5dc..c1d8e103ae98 100644 --- a/src/lib_signer_backends/tezos-signer-backends.opam +++ b/src/lib_signer_backends/tezos-signer-backends.opam @@ -7,7 +7,6 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "2.0" } - "fmt" "tezos-base" "tezos-stdlib" "tezos-client-base" @@ -16,6 +15,7 @@ depends: [ "tezos-shell-services" "alcotest-lwt" { with-test & >= "1.5.0" } "ocplib-endian" + "fmt" "tezos-stdlib-unix" "tezos-rpc-http-client-unix" ] diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune index d18aada04c82..22eb92bb69ec 100644 --- a/src/lib_stdlib/dune +++ b/src/lib_stdlib/dune @@ -7,6 +7,6 @@ zarith zarith_stubs_js lwt) - (js_of_ocaml) (inline_tests) - (preprocess (pps ppx_inline_test))) + (preprocess (pps ppx_inline_test)) + (js_of_ocaml)) diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune index c8198c5f7cb7..480f0caacffc 100644 --- a/src/lib_stdlib/test-unix/dune +++ b/src/lib_stdlib/test-unix/dune @@ -1,8 +1,5 @@ (tests - (names - test_lwt_pipe - test_circular_buffer - test_circular_buffer_fuzzy) + (names test_lwt_pipe test_circular_buffer test_circular_buffer_fuzzy) (package tezos-stdlib) (libraries tezos-stdlib diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune index fc0f0ba7c056..498db102508b 100644 --- a/src/lib_stdlib/test/dune +++ b/src/lib_stdlib/test/dune @@ -7,36 +7,41 @@ test_fallbackArray test_functionalArray) (package tezos-stdlib) + (modes native js) (libraries tezos-stdlib alcotest bigstring tezos-test-helpers qcheck-alcotest) - (modes native js) (flags (:standard -open Tezos_stdlib))) (rule - (alias runtest_js) - (package tezos-stdlib) - (action (run node %{dep:./test_bits.bc.js}))) + (alias runtest_js) + (package tezos-stdlib) + (action (run node %{dep:./test_bits.bc.js}))) + (rule - (alias runtest_js) - (package tezos-stdlib) - (action (run node %{dep:./test_tzList.bc.js}))) + (alias runtest_js) + (package tezos-stdlib) + (action (run node %{dep:./test_tzList.bc.js}))) + (rule - (alias runtest_js) - (package tezos-stdlib) - (action (run node %{dep:./test_bounded_heap.bc.js}))) + (alias runtest_js) + (package tezos-stdlib) + (action (run node %{dep:./test_bounded_heap.bc.js}))) + (rule - (alias runtest_js) - (package tezos-stdlib) - (action (run node %{dep:./test_tzString.bc.js}))) + (alias runtest_js) + (package tezos-stdlib) + (action (run node %{dep:./test_tzString.bc.js}))) + (rule - (alias runtest_js) - (package tezos-stdlib) - (action (run node %{dep:./test_fallbackArray.bc.js}))) + (alias runtest_js) + (package tezos-stdlib) + (action (run node %{dep:./test_fallbackArray.bc.js}))) + (rule - (alias runtest_js) - (package tezos-stdlib) - (action (run node %{dep:./test_functionalArray.bc.js}))) + (alias runtest_js) + (package tezos-stdlib) + (action (run node %{dep:./test_functionalArray.bc.js}))) diff --git a/src/lib_stdlib/tezos-stdlib.opam b/src/lib_stdlib/tezos-stdlib.opam index b3d048f7355a..ff3abd24f546 100644 --- a/src/lib_stdlib/tezos-stdlib.opam +++ b/src/lib_stdlib/tezos-stdlib.opam @@ -13,11 +13,11 @@ depends: [ "zarith_stubs_js" "lwt" { >= "5.4.0" } "alcotest" { with-test & >= "1.5.0" } - "alcotest-lwt" { with-test & >= "1.5.0" } - "lwt_log" {with-test} "bigstring" {with-test} "tezos-test-helpers" {with-test} "qcheck-alcotest" {with-test} + "alcotest-lwt" { with-test & >= "1.5.0" } + "lwt_log" {with-test} ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_test/dune b/src/lib_test/dune index 83846b1bd51c..1475e281b3eb 100644 --- a/src/lib_test/dune +++ b/src/lib_test/dune @@ -14,6 +14,4 @@ ;; This rule is necessary for `make lint-tests-pkg`, without it dune ;; complains that the alias is empty -(rule - (alias runtest_js) - (action progn)) \ No newline at end of file +(rule (alias runtest_js) (action progn)) diff --git a/src/lib_test/tezos-test-helpers.opam b/src/lib_test/tezos-test-helpers.opam index 3a548e338bbc..ffa24998775e 100644 --- a/src/lib_test/tezos-test-helpers.opam +++ b/src/lib_test/tezos-test-helpers.opam @@ -11,7 +11,7 @@ depends: [ "fmt" "qcheck-alcotest" "alcotest" { >= "1.5.0" } - "alcotest-lwt" { >= "1.5.0" } + "lwt" { >= "5.4.0" } "pure-splitmix" { = "0.2" } ] build: [ diff --git a/src/tooling/dune b/src/tooling/dune index 809c7e6ea7b5..353a4c390c82 100644 --- a/src/tooling/dune +++ b/src/tooling/dune @@ -1,8 +1,8 @@ (library (name tezos_tooling) (public_name tezos-tooling) - (modules) - (instrumentation (backend bisect_ppx))) + (instrumentation (backend bisect_ppx)) + (modules)) (install (package tezos-tooling) @@ -10,6 +10,8 @@ (files (lint.sh as lint.sh))) (executable - (name run_js_inline_tests) - (modules run_js_inline_tests) - (libraries parsexp unix)) + (name run_js_inline_tests) + (libraries + parsexp + unix) + (modules run_js_inline_tests)) diff --git a/src/tooling/tezos-tooling.opam b/src/tooling/tezos-tooling.opam index 6e12bd0e2548..de60c493df04 100644 --- a/src/tooling/tezos-tooling.opam +++ b/src/tooling/tezos-tooling.opam @@ -7,6 +7,8 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "2.0" } + "parsexp" {with-test} + "base-unix" {with-test} "coq-of-ocaml" { = "2.5.0" } "ocamlformat" { = "0.18.0" } "bisect_ppx" { >= "2.3" } -- GitLab