From 87e0de9826968592a0bcd8c9614030c98020463e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Wed, 25 Jul 2018 21:06:02 +0200 Subject: [PATCH] Dune: use the new syntax --- .dockerignore | 2 + .gitignore | 1 + docs/doc_gen/dune | 46 ++-- docs/doc_gen/errors/dune | 29 ++- dune | 14 +- dune-workspace | 1 + src/bin_client/dune | 42 ++-- src/bin_client/test/dune | 207 +++++++++-------- src/bin_client/test/test_tls.sh | 2 + src/bin_node/dune | 61 +++-- src/bin_signer/dune | 46 ++-- src/lib_base/dune | 56 +++-- src/lib_clic/dune | 24 +- src/lib_client_base/dune | 30 ++- src/lib_client_base_unix/dune | 44 ++-- src/lib_client_commands/dune | 36 ++- src/lib_crypto/dune | 46 ++-- src/lib_crypto/test/dune | 66 +++--- src/lib_data_encoding/dune | 28 ++- src/lib_data_encoding/test/dune | 58 +++-- src/lib_error_monad/dune | 24 +- src/lib_micheline/dune | 42 ++-- src/lib_p2p/dune | 28 ++- src/lib_p2p/test/dune | 136 ++++++------ src/lib_protocol_compiler/dune | 210 +++++++++--------- .../jbuild_embedded_protocol_template | 76 ++++--- .../jbuild_protocol_template | 70 ++---- .../main_embedded_packer.ml | 6 + src/lib_protocol_compiler/main_packer.ml | 2 + src/lib_protocol_environment/dune | 52 +++-- src/lib_protocol_environment/sigs/dune | 126 ++++++----- src/lib_protocol_environment/sigs_packer/dune | 14 +- src/lib_protocol_environment/test/dune | 34 ++- src/lib_protocol_updater/dune | 44 ++-- src/lib_rpc/dune | 28 ++- src/lib_rpc_http/dune | 24 +- src/lib_shell/bench/dune | 42 ++-- src/lib_shell/bench/helpers/dune | 30 ++- src/lib_shell/dune | 40 ++-- src/lib_shell/test/dune | 68 +++--- src/lib_shell_services/dune | 22 +- src/lib_signer_backends/dune | 38 ++-- src/lib_signer_backends/test/dune | 40 ++-- src/lib_signer_services/dune | 30 ++- src/lib_stdlib/dune | 34 ++- src/lib_stdlib/test/dune | 44 ++-- src/lib_stdlib_unix/dune | 26 +-- src/lib_storage/dune | 24 +- src/lib_storage/test/dune | 36 ++- src/proto_alpha/bin_accuser/dune | 32 ++- src/proto_alpha/bin_baker/dune | 32 ++- src/proto_alpha/bin_endorser/dune | 32 ++- src/proto_alpha/lib_client/dune | 46 ++-- src/proto_alpha/lib_client_commands/dune | 98 ++++---- src/proto_alpha/lib_delegate/dune | 148 ++++++------ src/proto_alpha/lib_delegate/test/dune | 84 ++++--- src/proto_alpha/lib_protocol/test/dune | 62 +++--- .../lib_protocol/test/helpers/dune | 30 ++- .../lib_protocol/test/michelson_parser/dune | 21 +- .../tezos-embedded-protocol-alpha.opam | 6 +- .../lib_protocol/tezos-protocol-alpha.opam | 6 +- .../tezos-embedded-protocol-demo.opam | 6 +- .../lib_protocol/tezos-protocol-demo.opam | 6 +- src/proto_genesis/lib_client/dune | 40 ++-- .../tezos-embedded-protocol-genesis.opam | 6 +- .../lib_protocol/tezos-protocol-genesis.opam | 6 +- vendors/irmin-lmdb/dune | 10 +- vendors/ocaml-bip39/src/dune | 23 +- vendors/ocaml-bip39/test/dune | 10 +- vendors/ocaml-blake2/src/dune | 12 +- vendors/ocaml-blake2/test/dune | 15 +- vendors/ocaml-hacl/src/config/dune | 6 +- vendors/ocaml-hacl/src/dune | 53 +++-- vendors/ocaml-hacl/test/dune | 15 +- vendors/ocaml-ledger-wallet/src/dune | 24 +- vendors/ocaml-ledger-wallet/test/dune | 11 +- vendors/ocaml-lmdb/config/dune | 4 +- vendors/ocaml-lmdb/src/dune | 19 +- vendors/ocaml-lmdb/test/dune | 11 +- vendors/ocaml-pbkdf/src/dune | 10 +- vendors/ocaml-pbkdf/test/dune | 11 +- vendors/ocaml-secp256k1/config/dune | 14 +- vendors/ocaml-secp256k1/src/dune | 23 +- vendors/ocaml-secp256k1/test/dune | 15 +- vendors/ocaml-uecc/src/dune | 20 +- vendors/ocaml-uecc/test/dune | 32 ++- vendors/ocplib-json-typed/dune | 1 - vendors/ocplib-json-typed/lib_json_typed/dune | 14 +- .../lib_json_typed_browser/dune | 14 +- .../lib_json_typed_bson/dune | 14 +- vendors/ocplib-resto/dune | 1 - .../ocplib-resto/lib_ezresto-directory/dune | 12 +- .../lib_ezresto-directory/test/dune | 16 +- vendors/ocplib-resto/lib_ezresto/dune | 12 +- vendors/ocplib-resto/lib_resto-cohttp/dune | 10 +- vendors/ocplib-resto/lib_resto-directory/dune | 12 +- .../lib_resto-directory/test/dune | 16 +- vendors/ocplib-resto/lib_resto-json/dune | 12 +- vendors/ocplib-resto/lib_resto/dune | 12 +- 99 files changed, 1594 insertions(+), 1780 deletions(-) create mode 100644 dune-workspace delete mode 100644 vendors/ocplib-json-typed/dune delete mode 100644 vendors/ocplib-resto/dune diff --git a/.dockerignore b/.dockerignore index 76c790c3b..cf0c58e24 100644 --- a/.dockerignore +++ b/.dockerignore @@ -31,6 +31,8 @@ docs/api/p2p.rst src/bin_client/test/LOG.* +**/dune-project + **/*.install **/.merlin diff --git a/.gitignore b/.gitignore index cc66c5b8e..18ffffcbd 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ __pycache__ /src/bin_client/test/LOG.* +dune-project *.install .merlin diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index 79c96ce6e..9470d9692 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -1,30 +1,26 @@ -(jbuild_version 1) - (executables - ((names (rpc_doc - p2p_doc)) - (libraries - (tezos-base - tezos-stdlib-unix - tezos-shell - tezos-protocol-updater - tezos-embedded-protocol-alpha - re)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_shell - -open Tezos_protocol_updater - -linkall)) -)) + (names rpc_doc + p2p_doc) + (libraries tezos-base + tezos-stdlib-unix + tezos-shell + tezos-protocol-updater + tezos-embedded-protocol-alpha + re) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_shell + -open Tezos_protocol_updater + -linkall))) (alias - ((name buildtest) - (deps (rpc_doc.exe - p2p_doc.exe)))) + (name buildtest) + (deps rpc_doc.exe + p2p_doc.exe)) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/docs/doc_gen/errors/dune b/docs/doc_gen/errors/dune index 356809bfc..e7e0d5fdf 100644 --- a/docs/doc_gen/errors/dune +++ b/docs/doc_gen/errors/dune @@ -1,19 +1,16 @@ -(jbuild_version 1) - (executable - ((name error_doc) - (libraries - (tezos-shell - tezos-client-alpha)) - (flags (:standard -w -9+27-30-32-40@8 - -open Tezos_base - -open Tezos_error_monad - -open Tezos_data_encoding - -open Tezos_client_alpha - -safe-string - -linkall)))) + (name error_doc) + (libraries tezos-shell + tezos-client-alpha) + (flags (:standard -w -9+27-30-32-40@8 + -open Tezos_base + -open Tezos_error_monad + -open Tezos_data_encoding + -open Tezos_client_alpha + -safe-string + -linkall))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/dune b/dune index 0d9d0539c..c8ef27903 100644 --- a/dune +++ b/dune @@ -1,9 +1,13 @@ -(jbuild_version 1) +(env + (dev + (flags (:standard))) + (release + (flags (:standard -O3)))) (alias - ((name runtest) - (deps ((alias_rec runtest_indent))))) + (name runtest) + (deps (alias_rec runtest_indent))) (alias - ((name runtest) - (deps ((alias_rec runtest_sandbox))))) + (name runtest) + (deps (alias_rec runtest_sandbox))) diff --git a/dune-workspace b/dune-workspace new file mode 100644 index 000000000..de4fc2092 --- /dev/null +++ b/dune-workspace @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/src/bin_client/dune b/src/bin_client/dune index 9aac5bd24..a90065389 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -1,20 +1,18 @@ -(jbuild_version 1) - (executables - ((names (main_client main_admin)) - (public_names (tezos-client tezos-admin-client)) - (libraries (tezos-base - tezos-rpc-http - tezos-shell-services - tezos-client-base - tezos-client-commands - tezos-client-genesis - tezos-client-alpha - tezos-stdlib-unix - tezos-client-base-unix - tezos-client-alpha-commands.registration - tezos-baking-alpha-commands.registration - tezos-signer-backends)) + (names main_client main_admin) + (public_names tezos-client tezos-admin-client) + (libraries tezos-base + tezos-rpc-http + tezos-shell-services + tezos-client-base + tezos-client-commands + tezos-client-genesis + tezos-client-alpha + tezos-stdlib-unix + tezos-client-base-unix + tezos-client-alpha-commands.registration + tezos-baking-alpha-commands.registration + tezos-signer-backends) (flags (:standard -w -9+27-30-32-40@8 -safe-string -open Tezos_base__TzPervasives @@ -23,13 +21,13 @@ -open Tezos_shell_services -open Tezos_client_base -open Tezos_client_commands - -open Tezos_client_base_unix)))) + -open Tezos_client_base_unix))) (install - ((section bin) - (files ((tezos-init-sandboxed-client.sh as tezos-init-sandboxed-client.sh))))) + (section bin) + (files (tezos-init-sandboxed-client.sh as tezos-init-sandboxed-client.sh))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/bin_client/test/dune b/src/bin_client/test/dune index 52d7e17fc..ead9cce07 100644 --- a/src/bin_client/test/dune +++ b/src/bin_client/test/dune @@ -1,114 +1,105 @@ -(jbuild_version 1) - (alias - ((name runtest_basic.sh) - (deps (sandbox.json - protocol_parameters.json - king_commitment.json - queen_commitment.json - test_lib.inc.sh - (glob_files contracts/*) - )) - (locks (/tcp-port/18731 - /tcp-port/19731)) - (action (run bash ${path:test_basic.sh} - ${bin:tezos-sandboxed-node.sh} - ${bin:tezos-node} - ${bin:tezos-init-sandboxed-client.sh} - ${bin:tezos-client} - ${bin:tezos-admin-client} - )))) - -(alias - ((name runtest_contracts.sh) - (deps (sandbox.json - test_lib.inc.sh - (glob_files contracts/*) - )) - (locks (/tcp-port/18731 - /tcp-port/19731)) - (action (run bash ${path:test_contracts.sh} - ${bin:tezos-sandboxed-node.sh} - ${bin:tezos-node} - ${bin:tezos-init-sandboxed-client.sh} - ${bin:tezos-client} - ${bin:tezos-admin-client} - )))) - -(alias - ((name runtest_multinode.sh) - (deps (sandbox.json - test_lib.inc.sh - (glob_files contracts/*.tz) - )) - (locks (/tcp-port/18731 /tcp-port/18732 /tcp-port/18733 /tcp-port/18734 - /tcp-port/18735 /tcp-port/18736 /tcp-port/18737 /tcp-port/18738 - /tcp-port/19731 /tcp-port/19732 /tcp-port/19733 /tcp-port/19734 - /tcp-port/19735 /tcp-port/19736 /tcp-port/19737 /tcp-port/19738)) - (action (run bash ${path:test_multinode.sh} - ${bin:tezos-sandboxed-node.sh} - ${bin:tezos-node} - ${bin:tezos-init-sandboxed-client.sh} - ${bin:tezos-client} - ${bin:tezos-admin-client} - )))) - -(alias - ((name runtest_injection.sh) - (locks (/tcp-port/18731 - /tcp-port/19731)) - (deps (sandbox.json - protocol_parameters.json - test_lib.inc.sh - (glob_files demo/*) - )) - (action (run bash ${path:test_injection.sh} - ${bin:tezos-sandboxed-node.sh} - ${bin:tezos-node} - ${bin:tezos-init-sandboxed-client.sh} - ${bin:tezos-client} - ${bin:tezos-admin-client} - ${bin:tezos-protocol-compiler} - )))) - -(alias - ((name runtest_tls.sh) - (locks (/tcp-port/18731 - /tcp-port/19731)) - (deps (sandbox.json - test_lib.inc.sh - (glob_files demo/*) - )) + (name runtest_basic.sh) + (deps sandbox.json + protocol_parameters.json + king_commitment.json + queen_commitment.json + test_lib.inc.sh + (glob_files contracts/*)) + (locks /tcp-port/18731 + /tcp-port/19731) (action - (setenv USE_TLS true (run bash ${path:test_tls.sh} - ${bin:tezos-sandboxed-node.sh} - ${bin:tezos-node} - ${bin:tezos-init-sandboxed-client.sh} - ${bin:tezos-client} - ${bin:tezos-admin-client} - ))))) + (run bash %{dep:test_basic.sh} + %{bin:tezos-sandboxed-node.sh} + %{bin:tezos-node} + %{bin:tezos-init-sandboxed-client.sh} + %{bin:tezos-client} + %{bin:tezos-admin-client}))) (alias - ((name runtest_cors.sh) - (locks (/tcp-port/18731 - /tcp-port/19731)) - (deps (sandbox.json - test_lib.inc.sh - (glob_files demo/*) - )) - (action (run bash ${path:test_cors.sh} - ${bin:tezos-sandboxed-node.sh} - ${bin:tezos-node} - ${bin:tezos-init-sandboxed-client.sh} - ${bin:tezos-client} - ${bin:tezos-admin-client} - )))) + (name runtest_contracts.sh) + (deps sandbox.json + test_lib.inc.sh + (glob_files contracts/*)) + (locks /tcp-port/18731 + /tcp-port/19731) + (action + (run bash %{dep:test_contracts.sh} + %{bin:tezos-sandboxed-node.sh} + %{bin:tezos-node} + %{bin:tezos-init-sandboxed-client.sh} + %{bin:tezos-client} + %{bin:tezos-admin-client}))) (alias - ((name runtest) - (deps ((alias runtest_basic.sh) - (alias runtest_contracts.sh) - (alias runtest_multinode.sh) - (alias runtest_injection.sh) - (alias runtest_tls.sh) - (alias runtest_cors.sh))))) + (name runtest_multinode.sh) + (deps sandbox.json + test_lib.inc.sh + (glob_files contracts/*.tz)) + (locks /tcp-port/18731 /tcp-port/18732 /tcp-port/18733 /tcp-port/18734 + /tcp-port/18735 /tcp-port/18736 /tcp-port/18737 /tcp-port/18738 + /tcp-port/19731 /tcp-port/19732 /tcp-port/19733 /tcp-port/19734 + /tcp-port/19735 /tcp-port/19736 /tcp-port/19737 /tcp-port/19738) + (action + (run bash %{dep:test_multinode.sh} + %{bin:tezos-sandboxed-node.sh} + %{bin:tezos-node} + %{bin:tezos-init-sandboxed-client.sh} + %{bin:tezos-client} + %{bin:tezos-admin-client}))) + +(alias + (name runtest_injection.sh) + (locks /tcp-port/18731 + /tcp-port/19731) + (deps sandbox.json + protocol_parameters.json + test_lib.inc.sh + (glob_files demo/*)) + (action + (run bash %{dep:test_injection.sh} + %{bin:tezos-sandboxed-node.sh} + %{bin:tezos-node} + %{bin:tezos-init-sandboxed-client.sh} + %{bin:tezos-client} + %{bin:tezos-admin-client} + %{bin:tezos-protocol-compiler}))) + +(alias + (name runtest_tls.sh) + (locks /tcp-port/18731 + /tcp-port/19731) + (deps sandbox.json + test_lib.inc.sh + (glob_files demo/*)) + (action + (run bash %{dep:test_tls.sh} + %{bin:tezos-sandboxed-node.sh} + %{bin:tezos-node} + %{bin:tezos-init-sandboxed-client.sh} + %{bin:tezos-client} + %{bin:tezos-admin-client}))) + +(alias + (name runtest_cors.sh) + (locks /tcp-port/18731 + /tcp-port/19731) + (deps sandbox.json + test_lib.inc.sh + (glob_files demo/*)) + (action + (run bash %{dep:test_cors.sh} + %{bin:tezos-sandboxed-node.sh} + %{bin:tezos-node} + %{bin:tezos-init-sandboxed-client.sh} + %{bin:tezos-client} + %{bin:tezos-admin-client}))) + +(alias + (name runtest) + (deps (alias runtest_basic.sh) + (alias runtest_contracts.sh) + (alias runtest_multinode.sh) + (alias runtest_injection.sh) + (alias runtest_tls.sh) + (alias runtest_cors.sh))) diff --git a/src/bin_client/test/test_tls.sh b/src/bin_client/test/test_tls.sh index 61edec2c4..d773e84c2 100755 --- a/src/bin_client/test/test_tls.sh +++ b/src/bin_client/test/test_tls.sh @@ -4,6 +4,8 @@ set -e +export USE_TLS=true + test_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)")" source $test_dir/test_lib.inc.sh "$@" diff --git a/src/bin_node/dune b/src/bin_node/dune index 4e4d3f894..6b4f57d42 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -1,36 +1,35 @@ -(jbuild_version 1) - (executable - ((name main) - (public_name tezos-node) - (libraries (tezos-base - tezos-stdlib-unix - tezos-shell-services - tezos-rpc-http - tezos-p2p - tezos-shell - tezos-protocol-updater - tezos-embedded-protocol-genesis - tezos-embedded-protocol-demo - tezos-embedded-protocol-alpha - cmdliner - tls)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_shell_services - -open Tezos_rpc_http - -open Tezos_p2p - -open Tezos_shell - -open Tezos_protocol_updater - -linkall)))) + (name main) + (public_name tezos-node) + (libraries tezos-base + tezos-stdlib-unix + tezos-shell-services + tezos-rpc-http + tezos-p2p + tezos-shell + tezos-protocol-updater + tezos-embedded-protocol-genesis + tezos-embedded-protocol-demo + tezos-embedded-protocol-alpha + cmdliner + tls) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_shell_services + -open Tezos_rpc_http + -open Tezos_p2p + -open Tezos_shell + -open Tezos_protocol_updater + -linkall))) (install - ((section bin) - (files ((tezos-sandboxed-node.sh as tezos-sandboxed-node.sh))))) + (section bin) + (files (tezos-sandboxed-node.sh as tezos-sandboxed-node.sh))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action + (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 6d981c140..3386b8021 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -1,27 +1,25 @@ -(jbuild_version 1) - (executables - ((names (main_signer)) - (public_names (tezos-signer)) - (libraries (tezos-base - tezos-client-base - tezos-client-base-unix - tezos-client-commands - tezos-signer-services - tezos-rpc-http - tezos-stdlib-unix - tezos-signer-backends)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -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_stdlib_unix)))) + (names main_signer) + (public_names tezos-signer) + (libraries tezos-base + tezos-client-base + tezos-client-base-unix + tezos-client-commands + tezos-signer-services + tezos-rpc-http + tezos-stdlib-unix + tezos-signer-backends) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -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_stdlib_unix))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_base/dune b/src/lib_base/dune index 73e214ce7..31f2ba3e8 100644 --- a/src/lib_base/dune +++ b/src/lib_base/dune @@ -1,32 +1,30 @@ -(jbuild_version 1) - (library - ((name tezos_base) - (public_name tezos-base) - (flags (:standard -w -30 - -open Tezos_stdlib - -open Tezos_crypto - -open Tezos_data_encoding - -open Tezos_error_monad - -open Tezos_rpc - -open Tezos_clic - -open Tezos_micheline - -safe-string)) - (libraries (tezos-stdlib - tezos-crypto - tezos-data-encoding - tezos-error-monad - tezos-rpc - tezos-clic - tezos-micheline - re.str - calendar - ezjsonm - lwt.unix - mtime.clock.os - ipaddr.unix)))) + (name tezos_base) + (public_name tezos-base) + (flags (:standard -w -30 + -open Tezos_stdlib + -open Tezos_crypto + -open Tezos_data_encoding + -open Tezos_error_monad + -open Tezos_rpc + -open Tezos_clic + -open Tezos_micheline + -safe-string)) + (libraries tezos-stdlib + tezos-crypto + tezos-data-encoding + tezos-error-monad + tezos-rpc + tezos-clic + tezos-micheline + re.str + calendar + ezjsonm + lwt.unix + mtime.clock.os + ipaddr.unix)) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_clic/dune b/src/lib_clic/dune index b55baf918..b574473f9 100644 --- a/src/lib_clic/dune +++ b/src/lib_clic/dune @@ -1,16 +1,14 @@ -(jbuild_version 1) - (library - ((name tezos_clic) - (public_name tezos-clic) - (flags (:standard -w -30 - -safe-string - -open Tezos_stdlib - -open Tezos_error_monad)) - (libraries (tezos-stdlib - tezos-error-monad)))) + (name tezos_clic) + (public_name tezos-clic) + (flags (:standard -w -30 + -safe-string + -open Tezos_stdlib + -open Tezos_error_monad)) + (libraries tezos-stdlib + tezos-error-monad)) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune index 8bcd4bd16..4ba2cd808 100644 --- a/src/lib_client_base/dune +++ b/src/lib_client_base/dune @@ -1,19 +1,17 @@ -(jbuild_version 1) - (library - ((name tezos_client_base) - (public_name tezos-client-base) - (libraries (tezos-base - tezos-shell-services - tezos-rpc)) - (library_flags (:standard -linkall)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_rpc - -open Tezos_shell_services)))) + (name tezos_client_base) + (public_name tezos-client-base) + (libraries tezos-base + tezos-shell-services + tezos-rpc) + (library_flags (:standard -linkall)) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_rpc + -open Tezos_shell_services))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index f5e2a3221..ab8d7a069 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -1,26 +1,24 @@ -(jbuild_version 1) - (library - ((name tezos_client_base_unix) - (public_name tezos-client-base-unix) - (libraries (tezos-base - tezos-client-base - tezos-client-commands - tezos-stdlib-unix - tezos-rpc-http - tezos-signer-backends - tezos-shell-services)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_rpc_http - -open Tezos_shell_services - -open Tezos_stdlib_unix - -open Tezos_client_base - -open Tezos_client_commands - -linkall)))) + (name tezos_client_base_unix) + (public_name tezos-client-base-unix) + (libraries tezos-base + tezos-client-base + tezos-client-commands + tezos-stdlib-unix + tezos-rpc-http + tezos-signer-backends + tezos-shell-services) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_rpc_http + -open Tezos_shell_services + -open Tezos_stdlib_unix + -open Tezos_client_base + -open Tezos_client_commands + -linkall))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index 0b0b5105e..db6541a18 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -1,22 +1,20 @@ -(jbuild_version 1) - (library - ((name tezos_client_commands) - (public_name tezos-client-commands) - (libraries (tezos-base - tezos-client-base - tezos-rpc - tezos-shell-services - tezos-signer-backends)) - (library_flags (:standard -linkall)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_rpc - -open Tezos_client_base - -open Tezos_shell_services)))) + (name tezos_client_commands) + (public_name tezos-client-commands) + (libraries tezos-base + tezos-client-base + tezos-rpc + tezos-shell-services + tezos-signer-backends) + (library_flags (:standard -linkall)) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_rpc + -open Tezos_client_base + -open Tezos_shell_services))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune index 902a189e0..01b0fc225 100644 --- a/src/lib_crypto/dune +++ b/src/lib_crypto/dune @@ -1,27 +1,25 @@ -(jbuild_version 1) - (library - ((name tezos_crypto) - (public_name tezos-crypto) - (flags (:standard -safe-string - -open Tezos_stdlib - -open Tezos_data_encoding - -open Tezos_error_monad - -open Tezos_rpc - -open Tezos_clic)) - (libraries (tezos-stdlib - tezos-data-encoding - tezos-error-monad - tezos-rpc - tezos-clic - lwt - blake2 - hacl - secp256k1 - uecc - zarith)))) + (name tezos_crypto) + (public_name tezos-crypto) + (flags (:standard -safe-string + -open Tezos_stdlib + -open Tezos_data_encoding + -open Tezos_error_monad + -open Tezos_rpc + -open Tezos_clic)) + (libraries tezos-stdlib + tezos-data-encoding + tezos-error-monad + tezos-rpc + tezos-clic + lwt + blake2 + hacl + secp256k1 + uecc + zarith)) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune index 443a6b6dc..f3d0d3858 100644 --- a/src/lib_crypto/test/dune +++ b/src/lib_crypto/test/dune @@ -1,49 +1,47 @@ -(jbuild_version 1) - (executables - ((names (test_merkle - test_base58 - test_ed25519 - test_blake2b)) - (libraries (tezos-stdlib - tezos-crypto - alcotest)) - (flags (:standard -w -9-32 - -safe-string - -open Tezos_stdlib - -open Tezos_crypto)))) + (names test_merkle + test_base58 + test_ed25519 + test_blake2b) + (libraries tezos-stdlib + tezos-crypto + alcotest) + (flags (:standard -w -9-32 + -safe-string + -open Tezos_stdlib + -open Tezos_crypto))) (alias - ((name buildtest) - (deps (test_merkle.exe - test_base58.exe - test_ed25519.exe - test_blake2b.exe)))) + (name buildtest) + (deps test_merkle.exe + test_base58.exe + test_ed25519.exe + test_blake2b.exe)) (alias - ((name runtest_merkle) - (action (run ${exe:test_merkle.exe})))) + (name runtest_merkle) + (action (run %{exe:test_merkle.exe}))) (alias - ((name runtest_base58) - (action (run ${exe:test_base58.exe})))) + (name runtest_base58) + (action (run %{exe:test_base58.exe}))) (alias - ((name runtest_ed25519) - (action (run ${exe:test_ed25519.exe})))) + (name runtest_ed25519) + (action (run %{exe:test_ed25519.exe}))) (alias - ((name runtest_blake2b) - (action (run ${exe:test_blake2b.exe})))) + (name runtest_blake2b) + (action (run %{exe:test_blake2b.exe}))) (alias - ((name runtest) - (deps ((alias runtest_merkle) - (alias runtest_base58) - (alias runtest_ed25519) - (alias runtest_blake2b))))) + (name runtest) + (deps (alias runtest_merkle) + (alias runtest_base58) + (alias runtest_ed25519) + (alias runtest_blake2b))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_data_encoding/dune b/src/lib_data_encoding/dune index 4031e13d1..914f0ab58 100644 --- a/src/lib_data_encoding/dune +++ b/src/lib_data_encoding/dune @@ -1,18 +1,16 @@ -(jbuild_version 1) - (library - ((name tezos_data_encoding) - (public_name tezos-data-encoding) - (libraries (tezos-stdlib - ocplib-json-typed - ocplib-json-typed-bson - zarith - ezjsonm)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_stdlib)))) + (name tezos_data_encoding) + (public_name tezos-data-encoding) + (libraries tezos-stdlib + ocplib-json-typed + ocplib-json-typed-bson + zarith + ezjsonm) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_stdlib))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_data_encoding/test/dune b/src/lib_data_encoding/test/dune index d943ee435..cbe268eab 100644 --- a/src/lib_data_encoding/test/dune +++ b/src/lib_data_encoding/test/dune @@ -1,43 +1,41 @@ -(jbuild_version 1) - (executables - ((names (test - test_generated - bench_data_encoding - )) - (libraries (tezos-stdlib - tezos_data_encoding - alcotest - crowbar)) - (flags (:standard -w -9-32 -safe-string - -open Tezos_stdlib - -open Tezos_data_encoding)))) + (names test + test_generated + bench_data_encoding + ) + (libraries tezos-stdlib + tezos_data_encoding + alcotest + crowbar) + (flags (:standard -w -9-32 -safe-string + -open Tezos_stdlib + -open Tezos_data_encoding))) (alias - ((name buildtest) - (deps (test.exe - test_generated.exe - bench_data_encoding.exe - )))) + (name buildtest) + (deps test.exe + test_generated.exe + bench_data_encoding.exe + )) (alias - ((name runtest_test) - (action (run ${exe:test.exe})))) + (name runtest_test) + (action (run %{exe:test.exe}))) (alias - ((name runtest_test_generated) - (action (run ${exe:test_generated.exe})))) + (name runtest_test_generated) + (action (run %{exe:test_generated.exe}))) (alias - ((name runtest) - (deps ((alias runtest_test) - (alias runtest_test_generated))))) + (name runtest) + (deps (alias runtest_test) + (alias runtest_test_generated))) (alias - ((name run_bench) - (action (run ${exe:bench_data_encoding.exe})))) + (name run_bench) + (action (run %{exe:bench_data_encoding.exe}))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune index 7694bf95c..edb4cccdf 100644 --- a/src/lib_error_monad/dune +++ b/src/lib_error_monad/dune @@ -1,16 +1,14 @@ -(jbuild_version 1) - (library - ((name tezos_error_monad) - (public_name tezos-error-monad) - (flags (:standard -open Tezos_stdlib - -open Tezos_data_encoding - -safe-string)) - (libraries (tezos-stdlib - tezos-data-encoding - lwt)))) + (name tezos_error_monad) + (public_name tezos-error-monad) + (flags (:standard -open Tezos_stdlib + -open Tezos_data_encoding + -safe-string)) + (libraries tezos-stdlib + tezos-data-encoding + lwt)) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune index 5debfd76c..3435082e3 100644 --- a/src/lib_micheline/dune +++ b/src/lib_micheline/dune @@ -1,25 +1,23 @@ -(jbuild_version 1) - (library - ((name tezos_micheline) - (public_name tezos-micheline) - (libraries - ( - ;; External - uutf - zarith - ;; Internal - tezos-stdlib - tezos-error-monad - tezos-data-encoding - )) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_stdlib - -open Tezos_error_monad - -open Tezos_data_encoding)))) + (name tezos_micheline) + (public_name tezos-micheline) + (libraries + + ;; External + uutf + zarith + ;; Internal + tezos-stdlib + tezos-error-monad + tezos-data-encoding + ) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_stdlib + -open Tezos_error_monad + -open Tezos_data_encoding))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_p2p/dune b/src/lib_p2p/dune index b3b12f7a4..dfd87b9e2 100644 --- a/src/lib_p2p/dune +++ b/src/lib_p2p/dune @@ -1,18 +1,16 @@ -(jbuild_version 1) - (library - ((name tezos_p2p) - (public_name tezos-p2p) - (libraries (tezos-base - tezos-stdlib-unix - tezos-shell-services)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_shell_services)))) + (name tezos_p2p) + (public_name tezos-p2p) + (libraries tezos-base + tezos-stdlib-unix + tezos-shell-services) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_shell_services))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index bcc2d5d3f..162e590ce 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -1,94 +1,92 @@ -(jbuild_version 1) - (executables - ((names (test_p2p_socket - test_p2p_pool - test_p2p_io_scheduler - test_p2p_peerset - test_p2p_ipv6set - test_p2p_banned_peers - )) - (libraries (tezos-base - tezos-stdlib-unix - tezos-shell-services - tezos-p2p - alcotest-lwt)) - (flags (:standard -w -9-32 - -linkall - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_shell_services - -open Tezos_p2p)))) + (names test_p2p_socket + test_p2p_pool + test_p2p_io_scheduler + test_p2p_peerset + test_p2p_ipv6set + test_p2p_banned_peers + ) + (libraries tezos-base + tezos-stdlib-unix + tezos-shell-services + tezos-p2p + alcotest-lwt) + (flags (:standard -w -9-32 + -linkall + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_shell_services + -open Tezos_p2p))) (alias - ((name buildtest) - (deps (test_p2p_socket.exe - test_p2p_pool.exe - test_p2p_io_scheduler.exe - test_p2p_peerset.exe - test_p2p_ipv6set.exe - test_p2p_banned_peers.exe - )))) + (name buildtest) + (deps test_p2p_socket.exe + test_p2p_pool.exe + test_p2p_io_scheduler.exe + test_p2p_peerset.exe + test_p2p_ipv6set.exe + test_p2p_banned_peers.exe + )) (alias - ((name runtest_p2p_socket) - (action (run ${exe:test_p2p_socket.exe} -v)))) + (name runtest_p2p_socket) + (action (run %{exe:test_p2p_socket.exe} -v))) (alias - ((name runtest_p2p_pool) - (action (run ${exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v)))) + (name runtest_p2p_pool) + (action (run %{exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v))) (alias - ((name runtest_p2p_io_scheduler) - (action (run ${exe:test_p2p_io_scheduler.exe} - --delay 5 --clients 8 - --max-upload-speed 262144 ;; 1 << 18 = 256kB - --max-download-speed 1048576 ;; 1 << 20 = 1MB - )))) + (name runtest_p2p_io_scheduler) + (action (run %{exe:test_p2p_io_scheduler.exe} + --delay 5 --clients 8 + --max-upload-speed 262144 ;; 1 << 18 = 256kB + --max-download-speed 1048576 ;; 1 << 20 = 1MB + ))) (alias - ((name runtest_p2p_socket_ipv4) - (action (run ${exe:test_p2p_socket.exe} -v - --addr "::ffff:127.0.0.1")))) + (name runtest_p2p_socket_ipv4) + (action (run %{exe:test_p2p_socket.exe} -v + --addr "::ffff:127.0.0.1"))) (alias - ((name runtest_p2p_pool_ipv4) - (action (run ${exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v - --addr "::ffff:127.0.0.1")))) + (name runtest_p2p_pool_ipv4) + (action (run %{exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v + --addr "::ffff:127.0.0.1"))) (alias - ((name runtest_p2p_io_scheduler_ipv4) - (action (run ${exe:test_p2p_io_scheduler.exe} - --delay 5 --clients 8 - --max-upload-speed 262144 ;; 1 << 18 = 256kB - --max-download-speed 1048576 ;; 1 << 20 = 1MB - --addr "::ffff:127.0.0.1" - )))) + (name runtest_p2p_io_scheduler_ipv4) + (action (run %{exe:test_p2p_io_scheduler.exe} + --delay 5 --clients 8 + --max-upload-speed 262144 ;; 1 << 18 = 256kB + --max-download-speed 1048576 ;; 1 << 20 = 1MB + --addr "::ffff:127.0.0.1" + ))) (alias - ((name runtest_p2p_ipv6set) - (action (run ${exe:test_p2p_ipv6set.exe} -v)))) + (name runtest_p2p_ipv6set) + (action (run %{exe:test_p2p_ipv6set.exe} -v))) (alias - ((name runtest_p2p_peerset) - (action (run ${exe:test_p2p_peerset.exe} -v)))) + (name runtest_p2p_peerset) + (action (run %{exe:test_p2p_peerset.exe} -v))) (alias - ((name runtest_p2p_banned_peers) - (action (run ${exe:test_p2p_banned_peers.exe} -v)))) + (name runtest_p2p_banned_peers) + (action (run %{exe:test_p2p_banned_peers.exe} -v))) (alias - ((name runtest) - (deps ((alias runtest_p2p_socket_ipv4) - (alias runtest_p2p_pool_ipv4) - (alias runtest_p2p_io_scheduler_ipv4) - (alias runtest_p2p_peerset) - (alias runtest_p2p_ipv6set) - (alias runtest_p2p_banned_peers) - )))) + (name runtest) + (deps (alias runtest_p2p_socket_ipv4) + (alias runtest_p2p_pool_ipv4) + (alias runtest_p2p_io_scheduler_ipv4) + (alias runtest_p2p_peerset) + (alias runtest_p2p_ipv6set) + (alias runtest_p2p_banned_peers) + )) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index 6608a9b41..4efdf54ea 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -1,127 +1,125 @@ -(jbuild_version 1) - (rule - ((targets (embedded_cmis.ml)) - (action - (run ${bin:ocp-ocamlres} -format ocaml -o ${@} - ${lib:stdlib:camlinternalFormatBasics.cmi} - ${path:tezos_protocol_registerer__Registerer.cmi} - ${lib:tezos-protocol-environment-sigs:tezos_protocol_environment_sigs.cmi} - ${lib:tezos-protocol-environment-sigs:tezos_protocol_environment_sigs__V1.cmi})))) + (targets embedded_cmis.ml) + (action + (run %{bin:ocp-ocamlres} -format ocaml -o %{targets} + %{lib:stdlib:camlinternalFormatBasics.cmi} + %{dep:.tezos_protocol_registerer.objs/tezos_protocol_registerer__Registerer.cmi} + %{lib:tezos-protocol-environment-sigs:tezos_protocol_environment_sigs.cmi} + %{lib:tezos-protocol-environment-sigs:tezos_protocol_environment_sigs__V1.cmi}))) (library - ((name tezos_protocol_registerer) - (public_name tezos-protocol-compiler.registerer) - (libraries (tezos-base - tezos-protocol-environment-sigs)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -opaque - -open Tezos_base__TzPervasives)) - (modules (Registerer)))) + (name tezos_protocol_registerer) + (public_name tezos-protocol-compiler.registerer) + (libraries tezos-base + tezos-protocol-environment-sigs) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -opaque + -open Tezos_base__TzPervasives)) + (modules Registerer)) (library - ((name tezos_protocol_compiler) - (public_name tezos-protocol-compiler) - (libraries (tezos-base - tezos-protocol-environment-sigs - tezos-stdlib-unix - compiler-libs.common - lwt.unix - ocplib-endian - ocplib-ocamlres - unix)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix)) - (modules (Embedded_cmis Packer Compiler)))) + (name tezos_protocol_compiler) + (public_name tezos-protocol-compiler) + (libraries tezos-base + tezos-protocol-environment-sigs + tezos-stdlib-unix + compiler-libs.common + lwt.unix + ocplib-endian + ocplib-ocamlres + unix) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix)) + (modules Embedded_cmis Packer Compiler)) (library - ((name tezos_protocol_compiler_byte) - (public_name tezos-protocol-compiler.byte) - (libraries (tezos-base - tezos-protocol-compiler - compiler-libs.bytecomp)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_protocol_compiler)) - (modules (Byte)))) + (name tezos_protocol_compiler_byte) + (public_name tezos-protocol-compiler.byte) + (libraries tezos-base + tezos-protocol-compiler + compiler-libs.bytecomp) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_protocol_compiler)) + (modules Byte)) (library - ((name tezos_protocol_compiler_native) - (public_name tezos-protocol-compiler.native) - (libraries (tezos-base - tezos-protocol-compiler - compiler-libs.optcomp)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_protocol_compiler)) - (modules (Native)))) + (name tezos_protocol_compiler_native) + (public_name tezos-protocol-compiler.native) + (libraries tezos-base + tezos-protocol-compiler + compiler-libs.optcomp) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_protocol_compiler)) + (modules Native)) (executable - ((name main_byte) - (public_name tezos-protocol-compiler-byte) - (modes (native)) - (libraries (tezos_protocol_compiler_byte)) - (flags (:standard -linkall)) - (modules (Main_byte)))) + (name main_byte) + (public_name tezos-protocol-compiler-byte) + (modes native) + (libraries tezos_protocol_compiler_byte) + (flags (:standard -linkall)) + (modules Main_byte)) (executable - ((name main_native) - (public_name tezos-protocol-compiler) - (modes (native)) - (libraries (tezos_protocol_compiler_native)) - (flags (:standard -linkall)) - (modules (Main_native)))) + (name main_native) + (public_name tezos-protocol-compiler) + (modes native) + (libraries tezos_protocol_compiler_native) + (flags (:standard -linkall)) + (modules Main_native)) (executable - ((name main_packer) - (public_name tezos-protocol-compiler.tezos-protocol-packer) - (libraries (tezos-base - tezos-protocol-compiler - tezos-stdlib-unix)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_protocol_compiler)) - (modules (Main_packer)))) + (name main_packer) + (public_name tezos-protocol-compiler.tezos-protocol-packer) + (libraries tezos-base + tezos-protocol-compiler + tezos-stdlib-unix) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_protocol_compiler)) + (modules Main_packer)) (executable - ((name main_embedded_packer) - (public_name tezos-embedded-protocol-packer) - (modes (native)) - (libraries (tezos-base - tezos-stdlib-unix)) - (flags (:standard -linkall - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix)) - (modules (Main_embedded_packer)))) + (name main_embedded_packer) + (public_name tezos-embedded-protocol-packer) + (modes native) + (libraries tezos-base + tezos-stdlib-unix) + (flags (:standard -linkall + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix)) + (modules Main_embedded_packer)) (install - ((section share) - (files (jbuild_protocol_template - jbuild_embedded_protocol_template)))) + (section share) + (files jbuild_protocol_template + jbuild_embedded_protocol_template)) (alias - ((name runtest_indent) - ;; we would like (deps ((glob_files *.ml \ embedded_cmis.ml))) - ;; meanwhile, we hardcode the module list - (deps ("embedded_cmis.mli" - "main_embedded_packer.ml" - "main_embedded_packer.mli" - "main_byte.ml" - "main_native.ml" - "native.ml" - "native.mli" - "byte.ml" - "byte.mli" - "packer.ml" - "packer.mli" - "registerer.ml" - "registerer.mli" - )) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + ;; we would like (deps ((glob_files *.ml \ embedded_cmis.ml))) + ;; meanwhile, we hardcode the module list + (deps "embedded_cmis.mli" + "main_embedded_packer.ml" + "main_embedded_packer.mli" + "main_byte.ml" + "main_native.ml" + "native.ml" + "native.mli" + "byte.ml" + "byte.mli" + "packer.ml" + "packer.mli" + "registerer.ml" + "registerer.mli" + ) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_protocol_compiler/jbuild_embedded_protocol_template b/src/lib_protocol_compiler/jbuild_embedded_protocol_template index 2f91bc56f..9398a0f2c 100644 --- a/src/lib_protocol_compiler/jbuild_embedded_protocol_template +++ b/src/lib_protocol_compiler/jbuild_embedded_protocol_template @@ -18,53 +18,57 @@ let lib_version = let version = String.concat "-" (String.split_on_char '_' lib_version) let () = Format.kasprintf Jbuild_plugin.V1.send {| -(jbuild_version 1) (rule - ((targets (environment.ml)) - (action - (write-file ${@@} - "include Tezos_protocol_environment_shell.MakeV1(struct let name = \"%s\" end)() + (targets environment.ml) + (action + (write-file %%{targets} + "include Tezos_protocol_environment_shell.MakeV1(struct let name = \"%s\" end)() module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end -")))) +"))) (rule - ((targets (registerer.ml)) - (deps (tezos_embedded_protocol_environment_%s.cmxa TEZOS_PROTOCOL)) - (action - (with-stdout-to ${@@} - (chdir ${ROOT} (run ${bin:tezos-embedded-protocol-packer} ${path-no-dep:.} "%s")))))) + (targets registerer.mli) + (action (write-file %%{targets} "(* empty *)"))) + +(rule + (targets registerer.ml) + (deps tezos_embedded_protocol_environment_%s.cmxa + (:src_dir TEZOS_PROTOCOL)) + (action + (with-stdout-to %%{targets} + (chdir %%{workspace_root} (run %%{bin:tezos-embedded-protocol-packer} "%%{src_dir}" "%s"))))) (library - ((name tezos_embedded_protocol_environment_%s) - (public_name tezos-embedded-protocol-%s.environment) - (library_flags (:standard -linkall)) - (libraries (tezos-protocol-environment-shell)) - (modules (Environment)))) + (name tezos_embedded_protocol_environment_%s) + (public_name tezos-embedded-protocol-%s.environment) + (library_flags (:standard -linkall)) + (libraries tezos-protocol-environment-shell) + (modules Environment)) (library - ((name tezos_embedded_raw_protocol_%s) - (public_name tezos-embedded-protocol-%s.raw) - (libraries (tezos_embedded_protocol_environment_%s)) - (library_flags (:standard -linkall)) - (flags (:standard -nopervasives -nostdlib -safe-string - -w +a-4-6-7-9-29-32-40..42-44-45-48 - -warn-error -a+8 - -open Tezos_embedded_protocol_environment_%s__Environment - -open Pervasives - -open Error_monad)) - (modules (:standard \ Environment Registerer)))) + (name tezos_embedded_raw_protocol_%s) + (public_name tezos-embedded-protocol-%s.raw) + (libraries tezos_embedded_protocol_environment_%s) + (library_flags (:standard -linkall)) + (flags (:standard -nopervasives -nostdlib -safe-string + -w +a-4-6-7-9-29-32-40..42-44-45-48 + -warn-error -a+8 + -open Tezos_embedded_protocol_environment_%s__Environment + -open Pervasives + -open Error_monad)) + (modules :standard \ Environment Registerer)) (library - ((name tezos_embedded_protocol_%s) - (public_name tezos-embedded-protocol-%s) - (library_flags (:standard -linkall)) - (libraries (tezos_embedded_raw_protocol_%s - tezos-protocol-updater - tezos-protocol-environment-shell)) - (flags (:standard -w +a-4-6-7-9-29-32-40..42-44-45-48 - -warn-error -a+8)) - (modules (Registerer)))) + (name tezos_embedded_protocol_%s) + (public_name tezos-embedded-protocol-%s) + (library_flags (:standard -linkall)) + (libraries tezos_embedded_raw_protocol_%s + tezos-protocol-updater + tezos-protocol-environment-shell) + (flags (:standard -w +a-4-6-7-9-29-32-40..42-44-45-48 + -warn-error -a+8)) + (modules Registerer)) |} version lib_version lib_version lib_version version lib_version version lib_version diff --git a/src/lib_protocol_compiler/jbuild_protocol_template b/src/lib_protocol_compiler/jbuild_protocol_template index e9141c6da..ae9a6c2d8 100644 --- a/src/lib_protocol_compiler/jbuild_protocol_template +++ b/src/lib_protocol_compiler/jbuild_protocol_template @@ -1,16 +1,5 @@ (* -*- tuareg -*- *) -(* Build a functorized version of the protocol with the - `tezos-protocol-compiler` This is bit hackish... - - AFAIK the current version of dune (1.0.1) does not allow - to compile with a custom `rule` the `(modules)` of a library. - - A trick is to provide the `.cmx` through the `(library_flags)` and - to generate a empty `.ml` to correctly handle the dependencies... *) - -#require "unix" - let prefix = "proto_" let dirname = Filename.basename @@ Filename.dirname @@ Sys.getcwd () @@ -34,54 +23,39 @@ let path = | Some _ -> "." let sources = - let d = Unix.opendir "src" in - let rec loop acc = - match Unix.readdir d with - | exception End_of_file -> - Unix.closedir d ; - acc - | file -> - let acc = - if Filename.check_suffix file ".mli" - || Filename.check_suffix file ".ml" then - ("src/" ^ file) :: acc - else - acc - in - loop acc in - loop [] + Format.kasprintf + Jbuild_plugin.V1.run_and_read_lines + "find src -name \\*.ml -or -name \\*.mli" let () = Format.kasprintf Jbuild_plugin.V1.send {| -(jbuild_version 1) - (rule - ((targets (functor.ml)) - (deps ((glob_files src/*.ml{,i}) - src/TEZOS_PROTOCOL)) - (action (with-stdout-to ${path-no-dep:functor.ml} - (chdir ${ROOT} - (run ${bin:tezos-protocol-compiler.tezos-protocol-packer} ${path-no-dep:src})))))) + (targets functor.ml) + (deps (glob_files src/*.ml{,i}) + (:src_dir src/TEZOS_PROTOCOL)) + (action (with-stdout-to %%{targets} + (chdir %%{workspace_root} + (run %%{bin:tezos-protocol-compiler.tezos-protocol-packer} %%{src_dir}))))) (library - ((name tezos_protocol_%s) - (public_name tezos-protocol-%s) - (libraries (tezos-protocol-environment-sigs)) - (flags (-w "+a-4-6-7-9-29-40..42-44-45-48" - -warn-error "-a+8" - -safe-string -nopervasives)) - (modules (Functor)))) + (name tezos_protocol_%s) + (public_name tezos-protocol-%s) + (libraries tezos-protocol-environment-sigs) + (flags -w "+a-4-6-7-9-29-40..42-44-45-48" + -warn-error "-a+8" + -safe-string -nopervasives) + (modules Functor)) (alias - ((name runtest_sandbox) - (deps (tezos_protocol_%s.cmx)))) + (name runtest_sandbox) + (deps .tezos_protocol_%s.objs/tezos_protocol_%s.cmx)) (alias - ((name runtest_indent) - (deps (@[%a@])) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps @[%a@]) + (action (run bash %%{libexec:tezos-stdlib:test-ocp-indent.sh} %%{deps}))) |} - lib_version version lib_version + lib_version version lib_version lib_version Format.(pp_print_list (fun ppf -> Format.fprintf ppf "%S")) sources diff --git a/src/lib_protocol_compiler/main_embedded_packer.ml b/src/lib_protocol_compiler/main_embedded_packer.ml index 95d7084aa..7ba951f01 100644 --- a/src/lib_protocol_compiler/main_embedded_packer.ml +++ b/src/lib_protocol_compiler/main_embedded_packer.ml @@ -26,6 +26,12 @@ let srcdir = Sys.argv.(1) let version = Sys.argv.(2) +let srcdir = + if Filename.basename srcdir = "TEZOS_PROTOCOL" then + Filename.dirname srcdir + else + srcdir + let hash, sources = match Lwt_main.run (Lwt_utils_unix.Protocol.read_dir srcdir) with | Ok (None, proto) -> diff --git a/src/lib_protocol_compiler/main_packer.ml b/src/lib_protocol_compiler/main_packer.ml index 9ba6602a9..80212dcab 100644 --- a/src/lib_protocol_compiler/main_packer.ml +++ b/src/lib_protocol_compiler/main_packer.ml @@ -34,6 +34,8 @@ let () = Arg.parse args_spec (fun s -> anonymous := s :: !anonymous) usage_msg ; let source_dir = match List.rev !anonymous with + | [ source_dir ] when Filename.basename source_dir = "TEZOS_PROTOCOL"-> + Filename.dirname source_dir | [ source_dir ] -> source_dir | _ -> Arg.usage args_spec usage_msg ; Pervasives.exit 1 in let hash, protocol = diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index cf64e2832..c229c166d 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -1,31 +1,29 @@ -(jbuild_version 1) +(library + (name tezos_protocol_environment) + (public_name tezos-protocol-environment) + (libraries tezos-base + tezos-protocol-environment-sigs + tezos-micheline) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_micheline)) + (wrapped false) + (modules Tezos_protocol_environment + Tezos_protocol_environment_faked + Tezos_protocol_environment_memory)) (library - ((name tezos_protocol_environment) - (public_name tezos-protocol-environment) - (libraries (tezos-base - tezos-protocol-environment-sigs - tezos-micheline)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_micheline)) - (wrapped false) - (modules (Tezos_protocol_environment - Tezos_protocol_environment_faked - Tezos_protocol_environment_memory)))) - -(library - ((name tezos_protocol_environment_shell) - (public_name tezos-protocol-environment-shell) - (libraries (tezos-base - tezos-protocol-environment - tezos-storage)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string)) - (modules (Tezos_protocol_environment_shell)))) + (name tezos_protocol_environment_shell) + (public_name tezos-protocol-environment-shell) + (libraries tezos-base + tezos-protocol-environment + tezos-storage) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string)) + (modules Tezos_protocol_environment_shell)) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_protocol_environment/sigs/dune b/src/lib_protocol_environment/sigs/dune index c717550c4..966959822 100644 --- a/src/lib_protocol_environment/sigs/dune +++ b/src/lib_protocol_environment/sigs/dune @@ -1,73 +1,71 @@ -(jbuild_version 1) - (rule - ((targets (v1.ml)) - (deps - ( - ;; Part of OCaml stdlib - v1/pervasives.mli - v1/list.mli - v1/string.mli - v1/int32.mli - v1/int64.mli - v1/format.mli + (targets v1.ml) + (deps + + ;; Part of OCaml stdlib + v1/pervasives.mli + v1/list.mli + v1/string.mli + v1/int32.mli + v1/int64.mli + v1/format.mli - ;; Part of external libraries - v1/mBytes.mli - v1/z.mli - v1/lwt.mli - v1/lwt_list.mli - v1/raw_hashes.mli + ;; Part of external libraries + v1/mBytes.mli + v1/z.mli + v1/lwt.mli + v1/lwt_list.mli + v1/raw_hashes.mli - ;; Tezos extended stdlib - v1/compare.mli - v1/data_encoding.mli - v1/error_monad.mli - v1/logging.mli - v1/time.mli - v1/option.mli + ;; Tezos extended stdlib + v1/compare.mli + v1/data_encoding.mli + v1/error_monad.mli + v1/logging.mli + v1/time.mli + v1/option.mli - v1/RPC_arg.mli - v1/RPC_path.mli - v1/RPC_query.mli - v1/RPC_service.mli - v1/RPC_answer.mli - v1/RPC_directory.mli + v1/RPC_arg.mli + v1/RPC_path.mli + v1/RPC_query.mli + v1/RPC_service.mli + v1/RPC_answer.mli + v1/RPC_directory.mli - v1/base58.mli - v1/s.mli - v1/set.mli - v1/map.mli - v1/blake2B.mli - v1/ed25519.mli - v1/secp256k1.mli - v1/p256.mli - v1/chain_id.mli - v1/signature.mli - v1/block_hash.mli - v1/operation_hash.mli - v1/operation_list_hash.mli - v1/operation_list_list_hash.mli - v1/protocol_hash.mli - v1/context_hash.mli + v1/base58.mli + v1/s.mli + v1/set.mli + v1/map.mli + v1/blake2B.mli + v1/ed25519.mli + v1/secp256k1.mli + v1/p256.mli + v1/chain_id.mli + v1/signature.mli + v1/block_hash.mli + v1/operation_hash.mli + v1/operation_list_hash.mli + v1/operation_list_list_hash.mli + v1/protocol_hash.mli + v1/context_hash.mli - ;; Tezos specifics - v1/micheline.mli - v1/block_header.mli - v1/fitness.mli - v1/operation.mli - v1/protocol.mli - v1/context.mli - v1/updater.mli - v1/RPC_context.mli + ;; Tezos specifics + v1/micheline.mli + v1/block_header.mli + v1/fitness.mli + v1/operation.mli + v1/protocol.mli + v1/context.mli + v1/updater.mli + v1/RPC_context.mli - )) - (action - (with-stdout-to ${@} - (chdir ${ROOT} (run ${exe:../sigs_packer/sigs_packer.exe} ${^})))))) + ) + (action + (with-stdout-to %{targets} + (chdir %{workspace_root}} (run %{exe:../sigs_packer/sigs_packer.exe} %{deps}))))) (library - ((name tezos_protocol_environment_sigs) - (public_name tezos-protocol-environment-sigs) - (flags (:standard -nopervasives -safe-string)) - (modules ("V1")))) + (name tezos_protocol_environment_sigs) + (public_name tezos-protocol-environment-sigs) + (flags (:standard -nopervasives -safe-string)) + (modules ("V1"))) diff --git a/src/lib_protocol_environment/sigs_packer/dune b/src/lib_protocol_environment/sigs_packer/dune index 3ebe19dcd..0f0785367 100644 --- a/src/lib_protocol_environment/sigs_packer/dune +++ b/src/lib_protocol_environment/sigs_packer/dune @@ -1,11 +1,9 @@ -(jbuild_version 1) - (executable - ((name sigs_packer) - (public_name tezos-protocol-environment-sigs.packer) - (package tezos-protocol-environment-sigs))) + (name sigs_packer) + (public_name tezos-protocol-environment-sigs.packer) + (package tezos-protocol-environment-sigs)) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune index 13918165c..19a1b6a4c 100644 --- a/src/lib_protocol_environment/test/dune +++ b/src/lib_protocol_environment/test/dune @@ -1,25 +1,23 @@ -(jbuild_version 1) - (executables - ((names (test)) - (libraries (tezos-base - tezos-protocol-environment - alcotest-lwt)) - (flags (:standard -w -9-32 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_protocol_environment)))) + (names test) + (libraries tezos-base + tezos-protocol-environment + alcotest-lwt) + (flags (:standard -w -9-32 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_protocol_environment))) (alias - ((name buildtest) - (deps (test.exe)))) + (name buildtest) + (deps test.exe)) (alias - ((name runtest) - (package tezos-protocol-environment) - (action (run ${exe:test.exe})))) + (name runtest) + (package tezos-protocol-environment) + (action (run %{exe:test.exe}))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune index ae299564f..17c71553d 100644 --- a/src/lib_protocol_updater/dune +++ b/src/lib_protocol_updater/dune @@ -1,26 +1,24 @@ -(jbuild_version 1) - (library - ((name tezos_protocol_updater) - (public_name tezos-protocol-updater) - (libraries (tezos-base - tezos-stdlib-unix - tezos-micheline - tezos-shell-services - tezos-protocol-environment-shell - tezos-protocol-compiler.registerer - tezos-protocol-compiler.native - tezos-storage - dynlink)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_micheline - -open Tezos_shell_services - -open Tezos_storage)))) + (name tezos_protocol_updater) + (public_name tezos-protocol-updater) + (libraries tezos-base + tezos-stdlib-unix + tezos-micheline + tezos-shell-services + tezos-protocol-environment-shell + tezos-protocol-compiler.registerer + tezos-protocol-compiler.native + tezos-storage + dynlink) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_micheline + -open Tezos_shell_services + -open Tezos_storage))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune index 3c87bcebc..43fecce78 100644 --- a/src/lib_rpc/dune +++ b/src/lib_rpc/dune @@ -1,18 +1,16 @@ -(jbuild_version 1) - (library - ((name tezos_rpc) - (public_name tezos-rpc) - (libraries (tezos-data-encoding - tezos-error-monad - ocplib-resto - ocplib-resto-directory)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_data_encoding - -open Tezos_error_monad)))) + (name tezos_rpc) + (public_name tezos-rpc) + (libraries tezos-data-encoding + tezos-error-monad + ocplib-resto + ocplib-resto-directory) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_data_encoding + -open Tezos_error_monad))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_rpc_http/dune b/src/lib_rpc_http/dune index 89bdd6fc3..b4d46d432 100644 --- a/src/lib_rpc_http/dune +++ b/src/lib_rpc_http/dune @@ -1,16 +1,14 @@ -(jbuild_version 1) - (library - ((name tezos_rpc_http) - (public_name tezos-rpc-http) - (libraries (tezos-base - ocplib-resto-cohttp)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_rpc)))) + (name tezos_rpc_http) + (public_name tezos-rpc-http) + (libraries tezos-base + ocplib-resto-cohttp) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_rpc))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_shell/bench/dune b/src/lib_shell/bench/dune index f82390426..c704908be 100644 --- a/src/lib_shell/bench/dune +++ b/src/lib_shell/bench/dune @@ -1,31 +1,29 @@ -(jbuild_version 1) - (executables - ((names (bench_simple bench_tool)) - (libraries (tezos-base - tezos-shell - tezos_alpha_bench_helpers)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_shell - -open Tezos_alpha_bench_helpers)))) + (names bench_simple bench_tool) + (libraries tezos-base + tezos-shell + tezos_alpha_bench_helpers) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_shell + -open Tezos_alpha_bench_helpers))) (alias - ((name buildtest) - (deps (bench_tool.exe bench_simple.exe)))) + (name buildtest) + (deps bench_tool.exe bench_simple.exe)) (alias - ((name runbench_alpha_simple) - (deps (bench_simple.exe)) - (action (chdir ${ROOT} (run ${exe:bench_simple.exe}))))) + (name runbench_alpha_simple) + (deps bench_simple.exe) + (action (chdir %{workspace_root} (run %{exe:bench_simple.exe})))) (alias - ((name runbench_alpha) - (deps (bench_tool.exe)) - (action (chdir ${ROOT} (run ${exe:bench_tool.exe}))))) + (name runbench_alpha) + (deps bench_tool.exe) + (action (chdir %{workspace_root} (run %{exe:bench_tool.exe})))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml*))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml*)) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_shell/bench/helpers/dune b/src/lib_shell/bench/helpers/dune index b4dfdbc46..314a92056 100644 --- a/src/lib_shell/bench/helpers/dune +++ b/src/lib_shell/bench/helpers/dune @@ -1,19 +1,17 @@ -(jbuild_version 1) - (library - ((name tezos_alpha_bench_helpers) - (libraries (tezos-base - tezos-stdlib-unix - tezos-shell-services - tezos-protocol-environment - tezos-protocol-alpha - alcotest-lwt)) - (flags (:standard -w -9-32 -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_shell_services)))) + (name tezos_alpha_bench_helpers) + (libraries tezos-base + tezos-stdlib-unix + tezos-shell-services + tezos-protocol-environment + tezos-protocol-alpha + alcotest-lwt) + (flags (:standard -w -9-32 -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_shell_services))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml*))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml*)) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_shell/dune b/src/lib_shell/dune index 1c80b31dc..efc5e37d4 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -1,24 +1,22 @@ -(jbuild_version 1) - (library - ((name tezos_shell) - (public_name tezos-shell) - (libraries (tezos-base - tezos-storage - tezos-rpc-http - tezos-p2p - tezos-shell-services - tezos-protocol-updater)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_storage - -open Tezos_rpc_http - -open Tezos_p2p - -open Tezos_shell_services - -open Tezos_protocol_updater)))) + (name tezos_shell) + (public_name tezos-shell) + (libraries tezos-base + tezos-storage + tezos-rpc-http + tezos-p2p + tezos-shell-services + tezos-protocol-updater) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_storage + -open Tezos_rpc_http + -open Tezos_p2p + -open Tezos_shell_services + -open Tezos_protocol_updater))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 3526bc44e..84cad004c 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -1,48 +1,46 @@ -(jbuild_version 1) - (executables - ((names (test - test_locator)) - (libraries (tezos-base - tezos-storage - tezos-protocol-updater - tezos-shell - tezos-shell-services - tezos-embedded-protocol-demo - tezos-stdlib-unix - alcotest-lwt)) - (flags (:standard -w -9-32 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_storage - -open Tezos_protocol_updater - -open Tezos_shell - -open Tezos_shell_services - -open Tezos_stdlib_unix)))) + (names test + test_locator) + (libraries tezos-base + tezos-storage + tezos-protocol-updater + tezos-shell + tezos-shell-services + tezos-embedded-protocol-demo + tezos-stdlib-unix + alcotest-lwt) + (flags (:standard -w -9-32 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_storage + -open Tezos_protocol_updater + -open Tezos_shell + -open Tezos_shell_services + -open Tezos_stdlib_unix))) (alias - ((name buildtest) - (deps (test.exe - test_locator.exe)))) + (name buildtest) + (deps test.exe + test_locator.exe)) (alias - ((name runtest_shell) - (action (run ${exe:test.exe})))) + (name runtest_shell) + (action (run %{exe:test.exe}))) (alias - ((name runtest_locator) - (action (run ${exe:test_locator.exe} --no-bench)))) + (name runtest_locator) + (action (run %{exe:test_locator.exe} --no-bench))) (alias - ((name runbench_locator) - (action (run ${exe:test_locator.exe})))) + (name runbench_locator) + (action (run %{exe:test_locator.exe}))) (alias - ((name runtest) - (deps ((alias runtest_shell) - (alias runtest_locator))))) + (name runtest) + (deps (alias runtest_shell) + (alias runtest_locator))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_shell_services/dune b/src/lib_shell_services/dune index 8154a5d62..2011ac862 100644 --- a/src/lib_shell_services/dune +++ b/src/lib_shell_services/dune @@ -1,15 +1,13 @@ -(jbuild_version 1) - (library - ((name tezos_shell_services) - (public_name tezos-shell-services) - (libraries (tezos-base)) - (flags (:standard -w +27@8 - -safe-string - -linkall - -open Tezos_base__TzPervasives)))) + (name tezos_shell_services) + (public_name tezos-shell-services) + (libraries tezos-base) + (flags (:standard -w +27@8 + -safe-string + -linkall + -open Tezos_base__TzPervasives))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_signer_backends/dune b/src/lib_signer_backends/dune index e2d5c290a..ecc819e13 100644 --- a/src/lib_signer_backends/dune +++ b/src/lib_signer_backends/dune @@ -1,23 +1,21 @@ -(jbuild_version 1) - (library - ((name tezos_signer_backends) - (public_name tezos-signer-backends) - (libraries (tezos-base - tezos-stdlib-unix - tezos-client-base - tezos-rpc-http - tezos-signer-services - pbkdf - bip39 - ledgerwallet-tezos)) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_client_base - -open Tezos_signer_services - -open Tezos_rpc_http)))) + (name tezos_signer_backends) + (public_name tezos-signer-backends) + (libraries tezos-base + tezos-stdlib-unix + tezos-client-base + tezos-rpc-http + tezos-signer-services + pbkdf + bip39 + ledgerwallet-tezos) + (flags (:standard -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_client_base + -open Tezos_signer_services + -open Tezos_rpc_http))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index 6bbad1c00..a7befe4b6 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -1,30 +1,28 @@ -(jbuild_version 1) - (executables - ((names (test_encrypted)) - (libraries (tezos-signer-backends - alcotest-lwt)) - (flags (:standard -w -9-32 - -safe-string - -open Tezos_error_monad - -open Tezos_stdlib - -open Tezos_crypto - -open Tezos_client_base - -open Tezos_signer_backends)))) + (names test_encrypted) + (libraries tezos-signer-backends + alcotest-lwt) + (flags (:standard -w -9-32 + -safe-string + -open Tezos_error_monad + -open Tezos_stdlib + -open Tezos_crypto + -open Tezos_client_base + -open Tezos_signer_backends))) (alias - ((name buildtest) - (deps (test_encrypted.exe)))) + (name buildtest) + (deps test_encrypted.exe)) (alias - ((name runtest_signer_encrypted) - (action (run ${exe:test_encrypted.exe})))) + (name runtest_signer_encrypted) + (action (run %{exe:test_encrypted.exe}))) (alias - ((name runtest) - (deps ((alias runtest_signer_encrypted))))) + (name runtest) + (deps (alias runtest_signer_encrypted))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_signer_services/dune b/src/lib_signer_services/dune index c72a58c43..7d0575380 100644 --- a/src/lib_signer_services/dune +++ b/src/lib_signer_services/dune @@ -1,19 +1,17 @@ -(jbuild_version 1) - (library - ((name tezos_signer_services) - (public_name tezos-signer-services) - (libraries (tezos-base - tezos-client-base - tezos-rpc)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_rpc - -open Tezos_client_base - -linkall)))) + (name tezos_signer_services) + (public_name tezos-signer-services) + (libraries tezos-base + tezos-client-base + tezos-rpc) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_rpc + -open Tezos_client_base + -linkall))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune index f57ad6cfb..95449499a 100644 --- a/src/lib_stdlib/dune +++ b/src/lib_stdlib/dune @@ -1,23 +1,21 @@ -(jbuild_version 1) - (library - ((name tezos_stdlib) - (public_name tezos-stdlib) - (libraries (ocplib-endian.bigstring - bigstring - cstruct - hex - re - zarith - lwt - lwt.log)) - (flags (:standard -safe-string)))) + (name tezos_stdlib) + (public_name tezos-stdlib) + (libraries ocplib-endian.bigstring + bigstring + cstruct + hex + re + zarith + lwt + lwt.log) + (flags (:standard -safe-string))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${path:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{dep:test-ocp-indent.sh} %{deps}))) (install - ((section libexec) - (files ((test-ocp-indent.sh as test-ocp-indent.sh))))) + (section libexec) + (files (test-ocp-indent.sh as test-ocp-indent.sh))) diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune index c92741763..7220ddaa0 100644 --- a/src/lib_stdlib/test/dune +++ b/src/lib_stdlib/test/dune @@ -1,34 +1,32 @@ -(jbuild_version 1) - (executables - ((names (test_tzList - test_lwt_pipe)) - (libraries (tezos-stdlib - alcotest - lwt.unix)) - (flags (:standard -w -9-32 - -safe-string - -open Tezos_stdlib)))) + (names test_tzList + test_lwt_pipe) + (libraries tezos-stdlib + alcotest + lwt.unix) + (flags (:standard -w -9-32 + -safe-string + -open Tezos_stdlib))) (alias - ((name buildtest) - (deps (test_tzList.exe - test_lwt_pipe.exe)))) + (name buildtest) + (deps test_tzList.exe + test_lwt_pipe.exe)) (alias - ((name runtest_tzList) - (action (run ${exe:test_tzList.exe})))) + (name runtest_tzList) + (action (run %{exe:test_tzList.exe}))) (alias - ((name runtest_lwt_pipe) - (action (run ${exe:test_lwt_pipe.exe})))) + (name runtest_lwt_pipe) + (action (run %{exe:test_lwt_pipe.exe}))) (alias - ((name runtest) - (deps ((alias runtest_tzList) - (alias runtest_lwt_pipe))))) + (name runtest) + (deps (alias runtest_tzList) + (alias runtest_lwt_pipe))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune index 8425564c7..10ba0e087 100644 --- a/src/lib_stdlib_unix/dune +++ b/src/lib_stdlib_unix/dune @@ -1,17 +1,15 @@ -(jbuild_version 1) - (library - ((name tezos_stdlib_unix) - (public_name tezos-stdlib-unix) - (flags (:standard -w -9-30 - -open Tezos_base__TzPervasives - -safe-string)) - (libraries (tezos-base - lwt.unix - ipaddr.unix - str)))) + (name tezos_stdlib_unix) + (public_name tezos-stdlib-unix) + (flags (:standard -w -9-30 + -open Tezos_base__TzPervasives + -safe-string)) + (libraries tezos-base + lwt.unix + ipaddr.unix + str)) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_storage/dune b/src/lib_storage/dune index 757e2ee25..e0820c116 100644 --- a/src/lib_storage/dune +++ b/src/lib_storage/dune @@ -1,16 +1,14 @@ -(jbuild_version 1) - (library - ((name tezos_storage) - (public_name tezos-storage) - (libraries (tezos-base - lmdb - irmin-lmdb)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives)))) + (name tezos_storage) + (public_name tezos-storage) + (libraries tezos-base + lmdb + irmin-lmdb) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/lib_storage/test/dune b/src/lib_storage/test/dune index 6ac812e78..67282a3fe 100644 --- a/src/lib_storage/test/dune +++ b/src/lib_storage/test/dune @@ -1,26 +1,24 @@ -(jbuild_version 1) - (executables - ((names (test)) - (libraries (tezos-base - tezos-storage - tezos-stdlib-unix - alcotest-lwt)) - (flags (:standard -w -9-32 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_storage - -open Tezos_stdlib_unix)))) + (names test) + (libraries tezos-base + tezos-storage + tezos-stdlib-unix + alcotest-lwt) + (flags (:standard -w -9-32 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_storage + -open Tezos_stdlib_unix))) (alias - ((name buildtest) - (deps (test.exe)))) + (name buildtest) + (deps test.exe)) (alias - ((name runtest) - (action (chdir ${ROOT} (run ${exe:test.exe}))))) + (name runtest) + (action (chdir %{workspace_root} (run %{exe:test.exe})))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index d03e06a60..314ffcb21 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -1,20 +1,18 @@ -(jbuild_version 1) - (executable - ((name main_accuser_alpha) - (public_name tezos-accuser-alpha) - (libraries (tezos-client-base-unix - tezos-client-commands - tezos-baking-alpha-commands)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_client_alpha - -open Tezos_client_commands - -open Tezos_baking_alpha_commands - -open Tezos_client_base_unix)))) + (name main_accuser_alpha) + (public_name tezos-accuser-alpha) + (libraries tezos-client-base-unix + tezos-client-commands + tezos-baking-alpha-commands) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_client_alpha + -open Tezos_client_commands + -open Tezos_baking_alpha_commands + -open Tezos_client_base_unix))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index a6fb777dd..ddf9ce2bb 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -1,20 +1,18 @@ -(jbuild_version 1) - (executable - ((name main_baker_alpha) - (public_name tezos-baker-alpha) - (libraries (tezos-client-base-unix - tezos-client-commands - tezos-baking-alpha-commands)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_client_alpha - -open Tezos_client_commands - -open Tezos_baking_alpha_commands - -open Tezos_client_base_unix)))) + (name main_baker_alpha) + (public_name tezos-baker-alpha) + (libraries tezos-client-base-unix + tezos-client-commands + tezos-baking-alpha-commands) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_client_alpha + -open Tezos_client_commands + -open Tezos_baking_alpha_commands + -open Tezos_client_base_unix))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/bin_endorser/dune b/src/proto_alpha/bin_endorser/dune index 52188d135..d7fb791d2 100644 --- a/src/proto_alpha/bin_endorser/dune +++ b/src/proto_alpha/bin_endorser/dune @@ -1,20 +1,18 @@ -(jbuild_version 1) - (executable - ((name main_endorser_alpha) - (public_name tezos-endorser-alpha) - (libraries (tezos-client-base-unix - tezos-client-commands - tezos-baking-alpha-commands)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_client_alpha - -open Tezos_client_commands - -open Tezos_baking_alpha_commands - -open Tezos_client_base_unix)))) + (name main_endorser_alpha) + (public_name tezos-endorser-alpha) + (libraries tezos-client-base-unix + tezos-client-commands + tezos-baking-alpha-commands) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_client_alpha + -open Tezos_client_commands + -open Tezos_baking_alpha_commands + -open Tezos_client_base_unix))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index 67cea0116..98216b9b8 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -1,27 +1,25 @@ -(jbuild_version 1) - (library - ((name tezos_client_alpha) - (public_name tezos-client-alpha) - (libraries (tezos-base - tezos-protocol-alpha - tezos-protocol-environment - tezos-shell-services - tezos-client-base - tezos-rpc - tezos-storage - tezos-signer-backends - bip39)) - (library_flags (:standard -linkall)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_shell_services - -open Tezos_client_base - -open Tezos_storage - -open Tezos_rpc)))) + (name tezos_client_alpha) + (public_name tezos-client-alpha) + (libraries tezos-base + tezos-protocol-alpha + tezos-protocol-environment + tezos-shell-services + tezos-client-base + tezos-rpc + tezos-storage + tezos-signer-backends + bip39) + (library_flags (:standard -linkall)) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_shell_services + -open Tezos_client_base + -open Tezos_storage + -open Tezos_rpc))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index c8921329e..15455bedb 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -1,54 +1,52 @@ -(jbuild_version 1) +(library + (name tezos_client_alpha_commands) + (public_name tezos-client-alpha-commands) + (libraries tezos-base + tezos-stdlib-unix + tezos-protocol-alpha + tezos-protocol-environment + tezos-shell-services + tezos-client-base + tezos-client-alpha + tezos-client-commands + tezos-rpc) + (library_flags (:standard -linkall)) + (modules (:standard \ alpha_commands_registration)) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_shell_services + -open Tezos_client_base + -open Tezos_client_alpha + -open Tezos_client_commands + -open Tezos_rpc))) (library - ((name tezos_client_alpha_commands) - (public_name tezos-client-alpha-commands) - (libraries (tezos-base - tezos-stdlib-unix - tezos-protocol-alpha - tezos-protocol-environment - tezos-shell-services - tezos-client-base - tezos-client-alpha - tezos-client-commands - tezos-rpc)) - (library_flags (:standard -linkall)) - (modules (:standard \ alpha_commands_registration)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_shell_services - -open Tezos_client_base - -open Tezos_client_alpha - -open Tezos_client_commands - -open Tezos_rpc)))) - -(library - ((name tezos_client_alpha_commands_registration) - (public_name tezos-client-alpha-commands.registration) - (libraries (tezos-base - tezos-protocol-alpha - tezos-protocol-environment - tezos-shell-services - tezos-client-base - tezos-client-alpha - tezos-client-commands - tezos-client-alpha-commands - tezos-rpc)) - (library_flags (:standard -linkall)) - (modules (alpha_commands_registration)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_shell_services - -open Tezos_client_base - -open Tezos_client_alpha - -open Tezos_client_commands - -open Tezos_client_alpha_commands - -open Tezos_rpc)))) + (name tezos_client_alpha_commands_registration) + (public_name tezos-client-alpha-commands.registration) + (libraries tezos-base + tezos-protocol-alpha + tezos-protocol-environment + tezos-shell-services + tezos-client-base + tezos-client-alpha + tezos-client-commands + tezos-client-alpha-commands + tezos-rpc) + (library_flags (:standard -linkall)) + (modules alpha_commands_registration) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_shell_services + -open Tezos_client_base + -open Tezos_client_alpha + -open Tezos_client_commands + -open Tezos_client_alpha_commands + -open Tezos_rpc))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index 4952f1dd9..ed916b4a9 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -1,81 +1,79 @@ -(jbuild_version 1) +(library + (name tezos_baking_alpha) + (public_name tezos-baking-alpha) + (libraries tezos-base + tezos-protocol-alpha + tezos-protocol-environment + tezos-shell-services + tezos-client-base + tezos-client-alpha + tezos-client-commands + tezos-storage + tezos-rpc) + (library_flags (:standard -linkall)) + (modules (:standard \ + delegate_commands + delegate_commands_registration)) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_shell_services + -open Tezos_client_base + -open Tezos_client_alpha + -open Tezos_client_commands + -open Tezos_storage + -open Tezos_rpc))) (library - ((name tezos_baking_alpha) - (public_name tezos-baking-alpha) - (libraries (tezos-base - tezos-protocol-alpha - tezos-protocol-environment - tezos-shell-services - tezos-client-base - tezos-client-alpha - tezos-client-commands - tezos-storage - tezos-rpc)) - (library_flags (:standard -linkall)) - (modules (:standard \ - delegate_commands - delegate_commands_registration)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_shell_services - -open Tezos_client_base - -open Tezos_client_alpha - -open Tezos_client_commands - -open Tezos_storage - -open Tezos_rpc)))) + (name tezos_baking_alpha_commands) + (public_name tezos-baking-alpha-commands) + (libraries tezos-base + tezos-protocol-alpha + tezos-protocol-environment + tezos-shell-services + tezos-client-base + tezos-client-alpha + tezos-client-commands + tezos-baking-alpha) + (library_flags (:standard -linkall)) + (modules delegate_commands) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_shell_services + -open Tezos_client_base + -open Tezos_client_alpha + -open Tezos_client_commands + -open Tezos_baking_alpha + -open Tezos_rpc))) (library - ((name tezos_baking_alpha_commands) - (public_name tezos-baking-alpha-commands) - (libraries (tezos-base - tezos-protocol-alpha - tezos-protocol-environment - tezos-shell-services - tezos-client-base - tezos-client-alpha - tezos-client-commands - tezos-baking-alpha)) - (library_flags (:standard -linkall)) - (modules (delegate_commands)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_shell_services - -open Tezos_client_base - -open Tezos_client_alpha - -open Tezos_client_commands - -open Tezos_baking_alpha - -open Tezos_rpc)))) - -(library - ((name tezos_baking_alpha_commands_registration) - (public_name tezos-baking-alpha-commands.registration) - (libraries (tezos-base - tezos-protocol-alpha - tezos-protocol-environment - tezos-shell-services - tezos-client-base - tezos-client-alpha - tezos-client-commands - tezos-baking-alpha - tezos-baking-alpha-commands - tezos-rpc)) - (library_flags (:standard -linkall)) - (modules (delegate_commands_registration)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_shell_services - -open Tezos_client_base - -open Tezos_client_alpha - -open Tezos_client_commands - -open Tezos_baking_alpha - -open Tezos_baking_alpha_commands - -open Tezos_rpc)))) + (name tezos_baking_alpha_commands_registration) + (public_name tezos-baking-alpha-commands.registration) + (libraries tezos-base + tezos-protocol-alpha + tezos-protocol-environment + tezos-shell-services + tezos-client-base + tezos-client-alpha + tezos-client-commands + tezos-baking-alpha + tezos-baking-alpha-commands + tezos-rpc) + (library_flags (:standard -linkall)) + (modules delegate_commands_registration) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_shell_services + -open Tezos_client_base + -open Tezos_client_alpha + -open Tezos_client_commands + -open Tezos_baking_alpha + -open Tezos_baking_alpha_commands + -open Tezos_rpc))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune index b167b7ac8..073fc6a81 100644 --- a/src/proto_alpha/lib_delegate/test/dune +++ b/src/proto_alpha/lib_delegate/test/dune @@ -1,56 +1,54 @@ -(jbuild_version 1) - (executables - ((names (test_michelson_parser - test_rpc - test_vote)) - (libraries (tezos-base - tezos-rpc-http - tezos-shell-services - tezos-client-base - tezos-client-genesis - tezos-client-alpha - tezos-baking-alpha - tezos-client-base-unix - tezos-signer-backends - alcotest-lwt)) - (flags (:standard -w -9-32 -safe-string - -open Tezos_base__TzPervasives - -open Tezos_rpc_http - -open Tezos_shell_services - -open Tezos_client_base - -open Tezos_client_genesis - -open Tezos_client_alpha - -open Tezos_baking_alpha - -open Tezos_client_base_unix)))) + (names test_michelson_parser + test_rpc + test_vote) + (libraries tezos-base + tezos-rpc-http + tezos-shell-services + tezos-client-base + tezos-client-genesis + tezos-client-alpha + tezos-baking-alpha + tezos-client-base-unix + tezos-signer-backends + alcotest-lwt) + (flags (:standard -w -9-32 -safe-string + -open Tezos_base__TzPervasives + -open Tezos_rpc_http + -open Tezos_shell_services + -open Tezos_client_base + -open Tezos_client_genesis + -open Tezos_client_alpha + -open Tezos_baking_alpha + -open Tezos_client_base_unix))) (alias - ((name buildtest) - (deps (test_michelson_parser.exe - test_rpc.exe - test_vote.exe)))) + (name buildtest) + (deps test_michelson_parser.exe + test_rpc.exe + test_vote.exe)) (alias - ((name runtest_michelson_parser) - (action (run ${exe:test_michelson_parser.exe})))) + (name runtest_michelson_parser) + (action (run %{exe:test_michelson_parser.exe}))) (alias - ((name runtest_vote) - (locks (/tcp-port/18400)) - (action (chdir ${ROOT} (run ${exe:test_vote.exe} ${bin:tezos-node} 18400))))) + (name runtest_vote) + (locks /tcp-port/18400) + (action (chdir %{workspace_root} (run %{exe:test_vote.exe} %{bin:tezos-node} 18400)))) (alias - ((name runtest_rpc) - (locks (/tcp-port/18500)) - (action (chdir ${ROOT} (run ${exe:test_rpc.exe} ${bin:tezos-node} 18500))))) + (name runtest_rpc) + (locks /tcp-port/18500) + (action (chdir %{workspace_root} (run %{exe:test_rpc.exe} %{bin:tezos-node} 18500)))) (alias - ((name runtest) - (deps ((alias runtest_michelson_parser) - (alias runtest_rpc) - (alias runtest_vote))))) + (name runtest) + (deps (alias runtest_michelson_parser) + (alias runtest_rpc) + (alias runtest_vote))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/lib_protocol/test/dune b/src/proto_alpha/lib_protocol/test/dune index 105ad647c..3fe334c64 100644 --- a/src/proto_alpha/lib_protocol/test/dune +++ b/src/proto_alpha/lib_protocol/test/dune @@ -1,45 +1,43 @@ -(jbuild_version 1) - (executable - ((name main) - (libraries (tezos-base - tezos-micheline - tezos-protocol-environment - alcotest-lwt - tezos_alpha_test_helpers - michelson_parser - tezos-stdlib-unix - bip39 - )) - (flags (:standard -w -9-32 -safe-string - -open Tezos_base__TzPervasives - -open Tezos_micheline - -open Tezos_alpha_test_helpers -)))) + (name main) + (libraries tezos-base + tezos-micheline + tezos-protocol-environment + alcotest-lwt + tezos_alpha_test_helpers + michelson_parser + tezos-stdlib-unix + bip39 + ) + (flags (:standard -w -9-32 -safe-string + -open Tezos_base__TzPervasives + -open Tezos_micheline + -open Tezos_alpha_test_helpers + ))) (alias - ((name buildtest) - (package tezos-protocol-alpha) - (deps (main.exe)))) + (name buildtest) + (package tezos-protocol-alpha) + (deps main.exe)) ; runs only the `Quick tests (alias - ((name runtest_proto_alpha) - (package tezos-protocol-alpha) - (action (chdir ${ROOT} (run ${exe:main.exe} -v -q))))) + (name runtest_proto_alpha) + (package tezos-protocol-alpha) + (action (chdir %{workspace_root} (run %{exe:main.exe} -v -q)))) ; runs both `Quick and `Slow tests (alias - ((name runtest_slow) - (package tezos-protocol-alpha) - (action (chdir ${ROOT} (run ${exe:main.exe} -v))))) + (name runtest_slow) + (package tezos-protocol-alpha) + (action (chdir %{workspace_root} (run %{exe:main.exe} -v)))) (alias - ((name runtest) - (package tezos-protocol-alpha) - (deps ((alias runtest_proto_alpha))))) + (name runtest) + (package tezos-protocol-alpha) + (deps (alias runtest_proto_alpha))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml*))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml*)) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index 9b11336a6..e790c36c4 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -1,19 +1,17 @@ -(jbuild_version 1) - (library - ((name tezos_alpha_test_helpers) - (libraries (tezos-base - tezos-stdlib-unix - tezos-shell-services - tezos-protocol-environment - tezos-protocol-alpha - alcotest-lwt)) - (flags (:standard -w -9-32 -safe-string - -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_shell_services)))) + (name tezos_alpha_test_helpers) + (libraries tezos-base + tezos-stdlib-unix + tezos-shell-services + tezos-protocol-environment + tezos-protocol-alpha + alcotest-lwt) + (flags (:standard -w -9-32 -safe-string + -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_shell_services))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml*))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml*)) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/lib_protocol/test/michelson_parser/dune b/src/proto_alpha/lib_protocol/test/michelson_parser/dune index 031677463..7666c2a01 100644 --- a/src/proto_alpha/lib_protocol/test/michelson_parser/dune +++ b/src/proto_alpha/lib_protocol/test/michelson_parser/dune @@ -1,15 +1,12 @@ -(jbuild_version 1) - (library - ((name michelson_parser) - (libraries (tezos-base - tezos_alpha_test_helpers - )) - (flags (:standard -w -9-32 -safe-string - -open Tezos_base__TzPervasives - -open Tezos_alpha_test_helpers)))) + (name michelson_parser) + (libraries tezos-base + tezos_alpha_test_helpers) + (flags (:standard -w -9-32 -safe-string + -open Tezos_base__TzPervasives + -open Tezos_alpha_test_helpers))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml*))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml*)) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam index 38f03145a..cff9572fe 100644 --- a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam @@ -14,9 +14,9 @@ depends: [ "tezos-protocol-updater" ] build: [ - [ "rm" "jbuild" "src/jbuild" ] - [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/jbuild" ] - [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "src/jbuild" ] + [ "rm" "dune" "src/dune" ] + [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/dune" ] + [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "src/dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ diff --git a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam index f09a42faf..97835f6ed 100644 --- a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam @@ -18,9 +18,9 @@ depends: [ "bip39" { test } ] build: [ - [ "rm" "jbuild" "src/jbuild" ] - [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] - [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "jbuild" ] + [ "rm" "dune" "src/dune" ] + [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "dune" ] + [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ diff --git a/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam index b993dedb4..630759b98 100644 --- a/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam +++ b/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam @@ -13,9 +13,9 @@ depends: [ "tezos-protocol-updater" ] build: [ - [ "rm" "jbuild" "src/jbuild" ] - [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/jbuild" ] - [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "src/jbuild" ] + [ "rm" "dune" "src/dune" ] + [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/dune" ] + [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "src/dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ diff --git a/src/proto_demo/lib_protocol/tezos-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-protocol-demo.opam index 0e3527617..d165b9258 100644 --- a/src/proto_demo/lib_protocol/tezos-protocol-demo.opam +++ b/src/proto_demo/lib_protocol/tezos-protocol-demo.opam @@ -12,9 +12,9 @@ depends: [ "tezos-protocol-compiler" ] build: [ - [ "rm" "jbuild" "src/jbuild" ] - [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] - [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "jbuild" ] + [ "rm" "dune" "src/dune" ] + [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "dune" ] + [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune index d4eea4b1e..7ed212465 100644 --- a/src/proto_genesis/lib_client/dune +++ b/src/proto_genesis/lib_client/dune @@ -1,24 +1,22 @@ -(jbuild_version 1) - (library - ((name tezos_client_genesis) - (public_name tezos-client-genesis) - (libraries (tezos-base - tezos-shell-services - tezos-client-base - tezos-client-commands - tezos-protocol-environment - tezos-protocol-genesis - tezos-protocol-alpha)) - (library_flags (:standard -linkall)) - (flags (:standard -w -9+27-30-32-40@8 - -safe-string - -open Tezos_base__TzPervasives - -open Tezos_shell_services - -open Tezos_client_base - -open Tezos_client_commands)))) + (name tezos_client_genesis) + (public_name tezos-client-genesis) + (libraries tezos-base + tezos-shell-services + tezos-client-base + tezos-client-commands + tezos-protocol-environment + tezos-protocol-genesis + tezos-protocol-alpha) + (library_flags (:standard -linkall)) + (flags (:standard -w -9+27-30-32-40@8 + -safe-string + -open Tezos_base__TzPervasives + -open Tezos_shell_services + -open Tezos_client_base + -open Tezos_client_commands))) (alias - ((name runtest_indent) - (deps ((glob_files *.ml{,i}))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) + (name runtest_indent) + (deps (glob_files *.ml{,i})) + (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam index 797caee71..a89d878dc 100644 --- a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam +++ b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam @@ -13,9 +13,9 @@ depends: [ "tezos-protocol-updater" ] build: [ - [ "rm" "jbuild" "src/jbuild" ] - [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/jbuild" ] - [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "src/jbuild" ] + [ "rm" "dune" "src/dune" ] + [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/dune" ] + [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "src/dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ diff --git a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam index 513537337..daf8f20df 100644 --- a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam +++ b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam @@ -12,9 +12,9 @@ depends: [ "tezos-protocol-compiler" ] build: [ - [ "rm" "jbuild" "src/jbuild" ] - [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] - [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "jbuild" ] + [ "rm" "dune" "src/dune" ] + [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "dune" ] + [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "dune" ] [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ diff --git a/vendors/irmin-lmdb/dune b/vendors/irmin-lmdb/dune index 03475240b..ab0458feb 100644 --- a/vendors/irmin-lmdb/dune +++ b/vendors/irmin-lmdb/dune @@ -1,7 +1,5 @@ -(jbuild_version 1) - (library - ((name irmin_lmdb) - (public_name irmin-lmdb) - (libraries (irmin lmdb)) - (flags (:standard -safe-string)))) + (name irmin_lmdb) + (public_name irmin-lmdb) + (libraries irmin lmdb) + (flags (:standard -safe-string))) diff --git a/vendors/ocaml-bip39/src/dune b/vendors/ocaml-bip39/src/dune index a99b61ca8..06b0d9d82 100644 --- a/vendors/ocaml-bip39/src/dune +++ b/vendors/ocaml-bip39/src/dune @@ -1,17 +1,16 @@ -(jbuild_version 1) - (library - ((name bip39) - (public_name bip39) - (modules (english bip39)) - (libraries (nocrypto pbkdf)))) + (name bip39) + (public_name bip39) + (modules english bip39) + (libraries nocrypto pbkdf)) (rule - ((targets (english.ml)) - (deps (generator.exe (files_recursively_in ../gen))) - (action (run ${<} ${@})))) + (targets english.ml) + (deps (:exe generator.exe) + (source_tree ../gen)) + (action (run %{exe} %{targets}))) (executable - ((name generator) - (modules (generator)) - (libraries (stdio)))) + (name generator) + (modules generator) + (libraries stdio)) diff --git a/vendors/ocaml-bip39/test/dune b/vendors/ocaml-bip39/test/dune index a0943da51..f1044c68a 100644 --- a/vendors/ocaml-bip39/test/dune +++ b/vendors/ocaml-bip39/test/dune @@ -1,8 +1,8 @@ (executable - ((name test) - (libraries (bip39 hex alcotest)))) + (name test) + (libraries bip39 hex alcotest)) (alias - ((name runtest-bip39) - (deps (test.exe)) - (action (run ${<})))) + (name runtest-bip39) + (deps (:exe test.exe)) + (action (run %{exe}))) diff --git a/vendors/ocaml-blake2/src/dune b/vendors/ocaml-blake2/src/dune index 8d1a727f6..8151c2fa4 100644 --- a/vendors/ocaml-blake2/src/dune +++ b/vendors/ocaml-blake2/src/dune @@ -1,8 +1,6 @@ -(jbuild_version 1) - (library - ((name blake2) - (public_name blake2) - (libraries (bigstring)) - (c_names (blake2b-ref)) - (c_flags (-O3)))) + (name blake2) + (public_name blake2) + (libraries bigstring) + (c_names blake2b-ref) + (c_flags (-O3))) diff --git a/vendors/ocaml-blake2/test/dune b/vendors/ocaml-blake2/test/dune index 68230860f..e31a08db2 100644 --- a/vendors/ocaml-blake2/test/dune +++ b/vendors/ocaml-blake2/test/dune @@ -1,14 +1,11 @@ -(jbuild_version 1) - (executable - ((name test) - (libraries (blake2 hex alcotest)))) + (name test) + (libraries blake2 hex alcotest)) (alias - ((name runtest-blake2) - (deps (test.exe)) - (action (run ${<})))) + (name runtest-blake2) + (action (run %{exe:test.exe}))) (alias - ((name runtest) - (deps ((alias runtest-blake2))))) + (name runtest) + (deps (alias runtest-blake2))) diff --git a/vendors/ocaml-hacl/src/config/dune b/vendors/ocaml-hacl/src/config/dune index d96941edd..4236bf577 100644 --- a/vendors/ocaml-hacl/src/config/dune +++ b/vendors/ocaml-hacl/src/config/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable - ((name discover) - (libraries (base stdio)))) + (name discover) + (libraries base stdio)) diff --git a/vendors/ocaml-hacl/src/dune b/vendors/ocaml-hacl/src/dune index 7b7fb1042..d32ccbaba 100644 --- a/vendors/ocaml-hacl/src/dune +++ b/vendors/ocaml-hacl/src/dune @@ -1,32 +1,29 @@ -(jbuild_version 1) - (library - ((name hacl) - (public_name hacl) - (libraries (bigstring ocplib-endian.bigstring zarith)) - (c_names (hacl_stubs - kremlib - FStar - Hacl_Policies - AEAD_Poly1305_64 - Hacl_Chacha20 - Hacl_Chacha20Poly1305 - Hacl_Curve25519 - Hacl_Ed25519 - Hacl_Poly1305_32 - Hacl_Poly1305_64 - Hacl_SHA2_256 - Hacl_SHA2_384 - Hacl_SHA2_512 - Hacl_HMAC_SHA2_256 - Hacl_Salsa20 - NaCl - Hacl_Unverified_Random)) - (c_flags (:include c_flags.sexp)) -)) + (name hacl) + (public_name hacl) + (libraries bigstring ocplib-endian.bigstring zarith) + (c_names hacl_stubs + kremlib + FStar + Hacl_Policies + AEAD_Poly1305_64 + Hacl_Chacha20 + Hacl_Chacha20Poly1305 + Hacl_Curve25519 + Hacl_Ed25519 + Hacl_Poly1305_32 + Hacl_Poly1305_64 + Hacl_SHA2_256 + Hacl_SHA2_384 + Hacl_SHA2_512 + Hacl_HMAC_SHA2_256 + Hacl_Salsa20 + NaCl + Hacl_Unverified_Random) + (c_flags (:include c_flags.sexp)) + ) ; sets flags for 32/64 bits architectures (rule - ((targets (c_flags.sexp)) - (deps (config/discover.exe)) - (action (run ${<} -ocamlc ${OCAMLC})))) + (targets c_flags.sexp) + (action (run %{exe:config/discover.exe} -ocamlc %{ocamlc}))) diff --git a/vendors/ocaml-hacl/test/dune b/vendors/ocaml-hacl/test/dune index a36d9064e..bbe28525e 100644 --- a/vendors/ocaml-hacl/test/dune +++ b/vendors/ocaml-hacl/test/dune @@ -1,14 +1,11 @@ -(jbuild_version 1) - (executable - ((name test) - (libraries (hex hacl alcotest)))) + (name test) + (libraries hex hacl alcotest)) (alias - ((name runtest-hacl) - (deps (test.exe)) - (action (run ${<})))) + (name runtest-hacl) + (action (run %{exe:test.exe}))) (alias - ((name runtest) - (deps ((alias runtest-hacl))))) + (name runtest) + (deps (alias runtest-hacl))) diff --git a/vendors/ocaml-ledger-wallet/src/dune b/vendors/ocaml-ledger-wallet/src/dune index 16346304b..0a5e90aa3 100644 --- a/vendors/ocaml-ledger-wallet/src/dune +++ b/vendors/ocaml-ledger-wallet/src/dune @@ -1,15 +1,13 @@ -(jbuild_version 1) +(library + (name ledgerwallet) + (public_name ledgerwallet) + (modules Apdu Transport) + (synopsis "Ledger wallet library for OCaml: common parts") + (libraries rresult cstruct hidapi)) (library - ((name ledgerwallet) - (public_name ledgerwallet) - (modules (Apdu Transport)) - (synopsis "Ledger wallet library for OCaml: common parts") - (libraries (rresult cstruct hidapi)))) - -(library - ((name ledgerwallet_tezos) - (public_name ledgerwallet-tezos) - (modules (Ledgerwallet_tezos)) - (synopsis "Ledger wallet library for OCaml: Tezos app") - (libraries (ledgerwallet)))) + (name ledgerwallet_tezos) + (public_name ledgerwallet-tezos) + (modules Ledgerwallet_tezos) + (synopsis "Ledger wallet library for OCaml: Tezos app") + (libraries ledgerwallet)) diff --git a/vendors/ocaml-ledger-wallet/test/dune b/vendors/ocaml-ledger-wallet/test/dune index 27aaee850..8d4be1bd1 100644 --- a/vendors/ocaml-ledger-wallet/test/dune +++ b/vendors/ocaml-ledger-wallet/test/dune @@ -1,9 +1,8 @@ (executable - ((name test_tezos) - (modules (Test_tezos)) - (libraries (hex alcotest ledgerwallet-tezos tweetnacl uecc)))) + (name test_tezos) + (modules Test_tezos) + (libraries hex alcotest ledgerwallet-tezos tweetnacl uecc)) (alias - ((name runtest-ledgerwallet-tezos) - (deps (test_tezos.exe)) - (action (run ${<})))) + (name runtest-ledgerwallet-tezos) + (action (run %{exe:test_tezos.exe}))) diff --git a/vendors/ocaml-lmdb/config/dune b/vendors/ocaml-lmdb/config/dune index fb28bc378..9d7ae4886 100644 --- a/vendors/ocaml-lmdb/config/dune +++ b/vendors/ocaml-lmdb/config/dune @@ -1,4 +1,2 @@ -(jbuild_version 1) - (executable - ((name discover))) + (name discover)) diff --git a/vendors/ocaml-lmdb/src/dune b/vendors/ocaml-lmdb/src/dune index 309a81734..9011f0558 100644 --- a/vendors/ocaml-lmdb/src/dune +++ b/vendors/ocaml-lmdb/src/dune @@ -1,14 +1,11 @@ -(jbuild_version 1) - (library - ((name lmdb) - (public_name lmdb) - (libraries (rresult)) - (c_names (mdb midl lmdb_stubs)) - (c_flags (:include c_flags.sexp)) - (c_library_flags (-lpthread)))) + (name lmdb) + (public_name lmdb) + (libraries rresult) + (c_names mdb midl lmdb_stubs) + (c_flags (:include c_flags.sexp)) + (c_library_flags (-lpthread))) (rule - ((targets (c_flags.sexp)) - (deps (../config/discover.exe)) - (action (run ${<} -ocamlc ${OCAMLC})))) + (targets c_flags.sexp) + (action (run %{exe:../config/discover.exe} -ocamlc %{ocamlc}))) diff --git a/vendors/ocaml-lmdb/test/dune b/vendors/ocaml-lmdb/test/dune index 6eb117168..76ab4659a 100644 --- a/vendors/ocaml-lmdb/test/dune +++ b/vendors/ocaml-lmdb/test/dune @@ -1,10 +1,7 @@ -(jbuild_version 1) - (executable - ((name test) - (libraries (cstruct rresult lmdb alcotest)))) + (name test) + (libraries cstruct rresult lmdb alcotest)) (alias - ((name runtest-lmdb) - (deps (test.exe)) - (action (run ${<})))) + (name runtest-lmdb) + (action (run %{exe:test.exe}))) diff --git a/vendors/ocaml-pbkdf/src/dune b/vendors/ocaml-pbkdf/src/dune index edc690b72..ebbcebd21 100644 --- a/vendors/ocaml-pbkdf/src/dune +++ b/vendors/ocaml-pbkdf/src/dune @@ -1,7 +1,5 @@ -(jbuild_version 1) - (library - ((name pbkdf) - (public_name pbkdf) - (synopsis "") - (libraries (nocrypto)))) + (name pbkdf) + (public_name pbkdf) + (synopsis "") + (libraries nocrypto)) diff --git a/vendors/ocaml-pbkdf/test/dune b/vendors/ocaml-pbkdf/test/dune index 3114e9332..01ef50a43 100644 --- a/vendors/ocaml-pbkdf/test/dune +++ b/vendors/ocaml-pbkdf/test/dune @@ -1,10 +1,7 @@ -(jbuild_version 1) - (executable - ((name pbkdf_tests) - (libraries (pbkdf alcotest)))) + (name pbkdf_tests) + (libraries pbkdf alcotest)) (alias - ((name runtest-pbkdf) - (deps (pbkdf_tests.exe)) - (action (run ${<})))) + (name runtest-pbkdf) + (action (run %{exe:pbkdf_tests.exe}))) diff --git a/vendors/ocaml-secp256k1/config/dune b/vendors/ocaml-secp256k1/config/dune index 409007962..e3a434e9d 100644 --- a/vendors/ocaml-secp256k1/config/dune +++ b/vendors/ocaml-secp256k1/config/dune @@ -1,11 +1,9 @@ -(jbuild_version 1) - (library - ((name config) - (modules config) - (c_names (config_stubs)))) + (name config) + (modules config) + (c_names config_stubs)) (executable - ((name discover) - (modules discover) - (libraries (config)))) + (name discover) + (modules discover) + (libraries config)) diff --git a/vendors/ocaml-secp256k1/src/dune b/vendors/ocaml-secp256k1/src/dune index 9c00fa8b5..a1f6727dd 100644 --- a/vendors/ocaml-secp256k1/src/dune +++ b/vendors/ocaml-secp256k1/src/dune @@ -1,16 +1,13 @@ -(jbuild_version 1) - (library - ((name libsecp256k1) - (public_name secp256k1) - (modules (internal external)) - (libraries (bigstring cstruct)) - (c_names (secp256k1 - secp256k1_wrap)) - (c_flags (:include c_flags.sexp)) - (c_library_flags (-lgmp)))) + (name libsecp256k1) + (public_name secp256k1) + (modules internal external) + (libraries bigstring cstruct) + (c_names secp256k1 + secp256k1_wrap) + (c_flags (:include c_flags.sexp)) + (c_library_flags (-lgmp))) (rule - ((targets (c_flags.sexp)) - (deps (../config/discover.exe)) - (action (run ${<} -ocamlc ${OCAMLC})))) + (targets c_flags.sexp) + (action (run %{exe:../config/discover.exe} -ocamlc %{ocaml}))) diff --git a/vendors/ocaml-secp256k1/test/dune b/vendors/ocaml-secp256k1/test/dune index df0c30c92..125c19b4a 100644 --- a/vendors/ocaml-secp256k1/test/dune +++ b/vendors/ocaml-secp256k1/test/dune @@ -1,14 +1,11 @@ -(jbuild_version 1) - (executable - ((name test) - (libraries (hex libsecp256k1 alcotest)))) + (name test) + (libraries hex libsecp256k1 alcotest)) (alias - ((name runtest-secp256k1) - (deps (test.exe)) - (action (run ${<})))) + (name runtest-secp256k1) + (action (run %{exe:test.exe}))) (alias - ((name runtest) - (deps ((alias runtest-secp256k1))))) + (name runtest) + (deps (alias runtest-secp256k1))) diff --git a/vendors/ocaml-uecc/src/dune b/vendors/ocaml-uecc/src/dune index f1fb581fd..2a6ad8d44 100644 --- a/vendors/ocaml-uecc/src/dune +++ b/vendors/ocaml-uecc/src/dune @@ -1,12 +1,10 @@ -(jbuild_version 1) - (library - ((name uecc) - (public_name uecc) - (synopsis "ECDH and ECDSA for 8-bit, 32-bit, and 64-bit processors.") - (c_names (uECC uecc_stubs)) - (c_flags (-O3 - -DuECC_OPTIMIZATION_LEVEL=3 - -DuECC_SQUARE_FUNC=1 - -DuECC_VLI_NATIVE_LITTLE_ENDIAN=0)) - (libraries (bigstring)))) + (name uecc) + (public_name uecc) + (synopsis "ECDH and ECDSA for 8-bit, 32-bit, and 64-bit processors.") + (c_names uECC uecc_stubs) + (c_flags (-O3 + -DuECC_OPTIMIZATION_LEVEL=3 + -DuECC_SQUARE_FUNC=1 + -DuECC_VLI_NATIVE_LITTLE_ENDIAN=0)) + (libraries bigstring)) diff --git a/vendors/ocaml-uecc/test/dune b/vendors/ocaml-uecc/test/dune index 74eddc728..5d6e6661d 100644 --- a/vendors/ocaml-uecc/test/dune +++ b/vendors/ocaml-uecc/test/dune @@ -1,26 +1,22 @@ -(jbuild_version 1) +(executable + (name test) + (modules Test) + (libraries alcotest uecc)) (executable - ((name test) - (modules (Test)) - (libraries (alcotest uecc)))) - -(executable - ((name test_vectors) - (modules (Vectors Test_vectors)) - (libraries (cstruct hex alcotest uecc)))) + (name test_vectors) + (modules Vectors Test_vectors) + (libraries cstruct hex alcotest uecc)) (alias - ((name runtest-uecc) - (deps (test.exe)) - (action (run ${<})))) + (name runtest-uecc) + (action (run %{exe:test.exe}))) (alias - ((name runtest-uecc-vectors) - (deps (test_vectors.exe)) - (action (run ${<})))) + (name runtest-uecc-vectors) + (action (run %{exe:test_vectors.exe}))) (alias - ((name runtest) - (deps ((alias runtest-uecc) - (alias runtest-uecc-vectors))))) + (name runtest) + (deps (alias runtest-uecc) + (alias runtest-uecc-vectors))) diff --git a/vendors/ocplib-json-typed/dune b/vendors/ocplib-json-typed/dune deleted file mode 100644 index 5e0ae1705..000000000 --- a/vendors/ocplib-json-typed/dune +++ /dev/null @@ -1 +0,0 @@ -(jbuild_version 1) diff --git a/vendors/ocplib-json-typed/lib_json_typed/dune b/vendors/ocplib-json-typed/lib_json_typed/dune index c1b7eabb8..dab2d241c 100644 --- a/vendors/ocplib-json-typed/lib_json_typed/dune +++ b/vendors/ocplib-json-typed/lib_json_typed/dune @@ -1,9 +1,7 @@ -(jbuild_version 1) - (library - ((name ocplib_json_typed) - (public_name ocplib-json-typed) - (flags (:standard -w -9)) - (synopsis "Reliable manipulation of JSON objects") - (libraries (uri)) - (wrapped false))) + (name ocplib_json_typed) + (public_name ocplib-json-typed) + (flags (:standard -w -9)) + (synopsis "Reliable manipulation of JSON objects") + (libraries uri) + (wrapped false)) diff --git a/vendors/ocplib-json-typed/lib_json_typed_browser/dune b/vendors/ocplib-json-typed/lib_json_typed_browser/dune index 2d927c6e3..95f627b0c 100644 --- a/vendors/ocplib-json-typed/lib_json_typed_browser/dune +++ b/vendors/ocplib-json-typed/lib_json_typed_browser/dune @@ -1,9 +1,7 @@ -(jbuild_version 1) - (library - ((name ocplib_json_typed_browser) - (public_name ocplib-json-typed-browser) - (flags (:standard -w -9)) - (synopsis "Native browser representation of JSON documents") - (libraries (ocplib-json-typed js_of_ocaml)) - (wrapped false))) + (name ocplib_json_typed_browser) + (public_name ocplib-json-typed-browser) + (flags (:standard -w -9)) + (synopsis "Native browser representation of JSON documents") + (libraries ocplib-json-typed js_of_ocaml) + (wrapped false)) diff --git a/vendors/ocplib-json-typed/lib_json_typed_bson/dune b/vendors/ocplib-json-typed/lib_json_typed_bson/dune index 75786e878..0e467d09c 100644 --- a/vendors/ocplib-json-typed/lib_json_typed_bson/dune +++ b/vendors/ocplib-json-typed/lib_json_typed_bson/dune @@ -1,9 +1,7 @@ -(jbuild_version 1) - (library - ((name ocplib_json_typed_bson) - (public_name ocplib-json-typed-bson) - (flags (:standard -w -9)) - (synopsis "BSON representation of JSON documents") - (libraries (ocplib-json-typed ocplib-endian)) - (wrapped false))) + (name ocplib_json_typed_bson) + (public_name ocplib-json-typed-bson) + (flags (:standard -w -9)) + (synopsis "BSON representation of JSON documents") + (libraries ocplib-json-typed ocplib-endian) + (wrapped false)) diff --git a/vendors/ocplib-resto/dune b/vendors/ocplib-resto/dune deleted file mode 100644 index 5e0ae1705..000000000 --- a/vendors/ocplib-resto/dune +++ /dev/null @@ -1 +0,0 @@ -(jbuild_version 1) diff --git a/vendors/ocplib-resto/lib_ezresto-directory/dune b/vendors/ocplib-resto/lib_ezresto-directory/dune index 96a45eb66..44efffd9b 100644 --- a/vendors/ocplib-resto/lib_ezresto-directory/dune +++ b/vendors/ocplib-resto/lib_ezresto-directory/dune @@ -1,8 +1,6 @@ -(jbuild_version 1) - (library - ((name ezresto_directory) - (public_name ocplib-ezresto-directory) - (libraries (ocplib-ezresto ocplib-resto-directory)) - (flags (:standard -safe-string)) - (wrapped false))) + (name ezresto_directory) + (public_name ocplib-ezresto-directory) + (libraries ocplib-ezresto ocplib-resto-directory) + (flags (:standard -safe-string)) + (wrapped false)) diff --git a/vendors/ocplib-resto/lib_ezresto-directory/test/dune b/vendors/ocplib-resto/lib_ezresto-directory/test/dune index 522cb604c..cf7925e64 100644 --- a/vendors/ocplib-resto/lib_ezresto-directory/test/dune +++ b/vendors/ocplib-resto/lib_ezresto-directory/test/dune @@ -1,14 +1,12 @@ -(jbuild_version 1) - (executable - ((name ezResto_test) - (flags (:standard -safe-string)) - (libraries (ocplib-ezresto-directory lwt.unix)))) + (name ezResto_test) + (flags (:standard -safe-string)) + (libraries ocplib-ezresto-directory lwt.unix)) (alias -((name runtest_ezresto) - (action (run ${path:ezResto_test.exe})))) + (name runtest_ezresto) + (action (run %{exe:ezResto_test.exe}))) (alias -((name runtest) - (deps ((alias runtest_ezresto))))) + (name runtest) + (deps (alias runtest_ezresto))) diff --git a/vendors/ocplib-resto/lib_ezresto/dune b/vendors/ocplib-resto/lib_ezresto/dune index 7cbc9ea4a..a4777745c 100644 --- a/vendors/ocplib-resto/lib_ezresto/dune +++ b/vendors/ocplib-resto/lib_ezresto/dune @@ -1,8 +1,6 @@ -(jbuild_version 1) - (library - ((name ezresto) - (public_name ocplib-ezresto) - (libraries (ocplib-resto-json)) - (wrapped false) - (flags (:standard -safe-string)))) + (name ezresto) + (public_name ocplib-ezresto) + (libraries ocplib-resto-json) + (wrapped false) + (flags (:standard -safe-string))) diff --git a/vendors/ocplib-resto/lib_resto-cohttp/dune b/vendors/ocplib-resto/lib_resto-cohttp/dune index 74f3234bf..28cd8af74 100644 --- a/vendors/ocplib-resto/lib_resto-cohttp/dune +++ b/vendors/ocplib-resto/lib_resto-cohttp/dune @@ -1,7 +1,5 @@ -(jbuild_version 1) - (library - ((name resto_cohttp) - (public_name ocplib-resto-cohttp) - (libraries (ocplib-resto-directory cohttp-lwt-unix)) - (flags (:standard -safe-string)))) + (name resto_cohttp) + (public_name ocplib-resto-cohttp) + (libraries ocplib-resto-directory cohttp-lwt-unix) + (flags (:standard -safe-string))) diff --git a/vendors/ocplib-resto/lib_resto-directory/dune b/vendors/ocplib-resto/lib_resto-directory/dune index ce18444ef..56ff97e7a 100644 --- a/vendors/ocplib-resto/lib_resto-directory/dune +++ b/vendors/ocplib-resto/lib_resto-directory/dune @@ -1,9 +1,7 @@ -(jbuild_version 1) - (library - ((name resto_directory) - (public_name ocplib-resto-directory) - (libraries (lwt ocplib-resto)) - (flags (:standard -safe-string)) - (wrapped false))) + (name resto_directory) + (public_name ocplib-resto-directory) + (libraries lwt ocplib-resto) + (flags (:standard -safe-string)) + (wrapped false)) diff --git a/vendors/ocplib-resto/lib_resto-directory/test/dune b/vendors/ocplib-resto/lib_resto-directory/test/dune index 4da476e75..df50743d6 100644 --- a/vendors/ocplib-resto/lib_resto-directory/test/dune +++ b/vendors/ocplib-resto/lib_resto-directory/test/dune @@ -1,14 +1,12 @@ -(jbuild_version 1) - (executable - ((name resto_test) - (flags (:standard -safe-string)) - (libraries (ocplib-resto-directory ocplib-resto-json lwt.unix)))) + (name resto_test) + (flags (:standard -safe-string)) + (libraries ocplib-resto-directory ocplib-resto-json lwt.unix)) (alias -((name runtest_resto) - (action (run ${path:resto_test.exe})))) + (name runtest_resto) + (action (run %{exe:resto_test.exe}))) (alias -((name runtest) - (deps ((alias runtest_resto))))) + (name runtest) + (deps (alias runtest_resto))) diff --git a/vendors/ocplib-resto/lib_resto-json/dune b/vendors/ocplib-resto/lib_resto-json/dune index 62e5316eb..9c7d69280 100644 --- a/vendors/ocplib-resto/lib_resto-json/dune +++ b/vendors/ocplib-resto/lib_resto-json/dune @@ -1,8 +1,6 @@ -(jbuild_version 1) - (library - ((name resto_json) - (public_name ocplib-resto-json) - (libraries (ocplib-json-typed ocplib-json-typed-bson ocplib-resto)) - (flags (:standard -safe-string)) - (wrapped false))) + (name resto_json) + (public_name ocplib-resto-json) + (libraries ocplib-json-typed ocplib-json-typed-bson ocplib-resto) + (flags (:standard -safe-string)) + (wrapped false)) diff --git a/vendors/ocplib-resto/lib_resto/dune b/vendors/ocplib-resto/lib_resto/dune index 8d0f8b2d2..7d22ee828 100644 --- a/vendors/ocplib-resto/lib_resto/dune +++ b/vendors/ocplib-resto/lib_resto/dune @@ -1,8 +1,6 @@ -(jbuild_version 1) - (library - ((name resto) - (public_name ocplib-resto) - (flags (-w -30 -safe-string)) - (libraries (uri)) - (wrapped false))) + (name resto) + (public_name ocplib-resto) + (flags (-w -30 -safe-string)) + (libraries uri) + (wrapped false))