balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dune: use the new syntax

Browse Source
This commit is contained in:
Grégoire Henry 2018-07-25 21:06:02 +02:00
parent 5362b321d9
commit 87e0de9826
99 changed files with 1594 additions and 1780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

@ -31,6 +31,8 @@ docs/api/p2p.rst
src/bin_client/test/LOG.* src/bin_client/test/LOG.*
**/dune-project
**/*.install **/*.install
**/.merlin **/.merlin

1
.gitignore vendored
View File

@ -31,6 +31,7 @@ __pycache__
/src/bin_client/test/LOG.* /src/bin_client/test/LOG.*
dune-project
*.install *.install
.merlin .merlin

26
docs/doc_gen/dune
View File

@ -1,30 +1,26 @@
(jbuild_version 1)
(executables (executables
((names (rpc_doc (names rpc_doc
p2p_doc)) p2p_doc)
(libraries (libraries tezos-base
(tezos-base
tezos-stdlib-unix tezos-stdlib-unix
tezos-shell tezos-shell
tezos-protocol-updater tezos-protocol-updater
tezos-embedded-protocol-alpha tezos-embedded-protocol-alpha
re)) re)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix -open Tezos_stdlib_unix
-open Tezos_shell -open Tezos_shell
-open Tezos_protocol_updater -open Tezos_protocol_updater
-linkall)) -linkall)))
))
(alias (alias
((name buildtest) (name buildtest)
(deps (rpc_doc.exe (deps rpc_doc.exe
p2p_doc.exe)))) p2p_doc.exe))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

17
docs/doc_gen/errors/dune
View File

@ -1,19 +1,16 @@
(jbuild_version 1)
(executable (executable
((name error_doc) (name error_doc)
(libraries (libraries tezos-shell
(tezos-shell tezos-client-alpha)
tezos-client-alpha))
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-open Tezos_base -open Tezos_base
-open Tezos_error_monad -open Tezos_error_monad
-open Tezos_data_encoding -open Tezos_data_encoding
-open Tezos_client_alpha -open Tezos_client_alpha
-safe-string -safe-string
-linkall)))) -linkall)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

14
dune
View File

@ -1,9 +1,13 @@
(jbuild_version 1) (env
(dev
(flags (:standard)))
(release
(flags (:standard -O3))))
(alias (alias
((name runtest) (name runtest)
(deps ((alias_rec runtest_indent))))) (deps (alias_rec runtest_indent)))
(alias (alias
((name runtest) (name runtest)
(deps ((alias_rec runtest_sandbox))))) (deps (alias_rec runtest_sandbox)))

1
dune-workspace Normal file
View File

@ -0,0 +1 @@
(lang dune 1.0)

22
src/bin_client/dune
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(executables (executables
((names (main_client main_admin)) (names main_client main_admin)
(public_names (tezos-client tezos-admin-client)) (public_names tezos-client tezos-admin-client)
(libraries (tezos-base (libraries tezos-base
tezos-rpc-http tezos-rpc-http
tezos-shell-services tezos-shell-services
tezos-client-base tezos-client-base
@ -14,7 +12,7 @@
tezos-client-base-unix tezos-client-base-unix
tezos-client-alpha-commands.registration tezos-client-alpha-commands.registration
tezos-baking-alpha-commands.registration tezos-baking-alpha-commands.registration
tezos-signer-backends)) tezos-signer-backends)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
@ -23,13 +21,13 @@
-open Tezos_shell_services -open Tezos_shell_services
-open Tezos_client_base -open Tezos_client_base
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_client_base_unix)))) -open Tezos_client_base_unix)))
(install (install
((section bin) (section bin)
(files ((tezos-init-sandboxed-client.sh as tezos-init-sandboxed-client.sh))))) (files (tezos-init-sandboxed-client.sh as tezos-init-sandboxed-client.sh)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

165
src/bin_client/test/dune
View File

@ -1,114 +1,105 @@
(jbuild_version 1)
(alias (alias
((name runtest_basic.sh) (name runtest_basic.sh)
(deps (sandbox.json (deps sandbox.json
protocol_parameters.json protocol_parameters.json
king_commitment.json king_commitment.json
queen_commitment.json queen_commitment.json
test_lib.inc.sh test_lib.inc.sh
(glob_files contracts/*) (glob_files contracts/*))
)) (locks /tcp-port/18731
(locks (/tcp-port/18731 /tcp-port/19731)
/tcp-port/19731)) (action
(action (run bash ${path:test_basic.sh} (run bash %{dep:test_basic.sh}
${bin:tezos-sandboxed-node.sh} %{bin:tezos-sandboxed-node.sh}
${bin:tezos-node} %{bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh} %{bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client} %{bin:tezos-client}
${bin:tezos-admin-client} %{bin:tezos-admin-client})))
))))
(alias (alias
((name runtest_contracts.sh) (name runtest_contracts.sh)
(deps (sandbox.json (deps sandbox.json
test_lib.inc.sh test_lib.inc.sh
(glob_files contracts/*) (glob_files contracts/*))
)) (locks /tcp-port/18731
(locks (/tcp-port/18731 /tcp-port/19731)
/tcp-port/19731)) (action
(action (run bash ${path:test_contracts.sh} (run bash %{dep:test_contracts.sh}
${bin:tezos-sandboxed-node.sh} %{bin:tezos-sandboxed-node.sh}
${bin:tezos-node} %{bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh} %{bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client} %{bin:tezos-client}
${bin:tezos-admin-client} %{bin:tezos-admin-client})))
))))
(alias (alias
((name runtest_multinode.sh) (name runtest_multinode.sh)
(deps (sandbox.json (deps sandbox.json
test_lib.inc.sh test_lib.inc.sh
(glob_files contracts/*.tz) (glob_files contracts/*.tz))
)) (locks /tcp-port/18731 /tcp-port/18732 /tcp-port/18733 /tcp-port/18734
(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/18735 /tcp-port/18736 /tcp-port/18737 /tcp-port/18738
/tcp-port/19731 /tcp-port/19732 /tcp-port/19733 /tcp-port/19734 /tcp-port/19731 /tcp-port/19732 /tcp-port/19733 /tcp-port/19734
/tcp-port/19735 /tcp-port/19736 /tcp-port/19737 /tcp-port/19738)) /tcp-port/19735 /tcp-port/19736 /tcp-port/19737 /tcp-port/19738)
(action (run bash ${path:test_multinode.sh} (action
${bin:tezos-sandboxed-node.sh} (run bash %{dep:test_multinode.sh}
${bin:tezos-node} %{bin:tezos-sandboxed-node.sh}
${bin:tezos-init-sandboxed-client.sh} %{bin:tezos-node}
${bin:tezos-client} %{bin:tezos-init-sandboxed-client.sh}
${bin:tezos-admin-client} %{bin:tezos-client}
)))) %{bin:tezos-admin-client})))
(alias (alias
((name runtest_injection.sh) (name runtest_injection.sh)
(locks (/tcp-port/18731 (locks /tcp-port/18731
/tcp-port/19731)) /tcp-port/19731)
(deps (sandbox.json (deps sandbox.json
protocol_parameters.json protocol_parameters.json
test_lib.inc.sh test_lib.inc.sh
(glob_files demo/*) (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/*)
))
(action (action
(setenv USE_TLS true (run bash ${path:test_tls.sh} (run bash %{dep:test_injection.sh}
${bin:tezos-sandboxed-node.sh} %{bin:tezos-sandboxed-node.sh}
${bin:tezos-node} %{bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh} %{bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client} %{bin:tezos-client}
${bin:tezos-admin-client} %{bin:tezos-admin-client}
))))) %{bin:tezos-protocol-compiler})))
(alias (alias
((name runtest_cors.sh) (name runtest_tls.sh)
(locks (/tcp-port/18731 (locks /tcp-port/18731
/tcp-port/19731)) /tcp-port/19731)
(deps (sandbox.json (deps sandbox.json
test_lib.inc.sh test_lib.inc.sh
(glob_files demo/*) (glob_files demo/*))
)) (action
(action (run bash ${path:test_cors.sh} (run bash %{dep:test_tls.sh}
${bin:tezos-sandboxed-node.sh} %{bin:tezos-sandboxed-node.sh}
${bin:tezos-node} %{bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh} %{bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client} %{bin:tezos-client}
${bin:tezos-admin-client} %{bin:tezos-admin-client})))
))))
(alias (alias
((name runtest) (name runtest_cors.sh)
(deps ((alias runtest_basic.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_contracts.sh)
(alias runtest_multinode.sh) (alias runtest_multinode.sh)
(alias runtest_injection.sh) (alias runtest_injection.sh)
(alias runtest_tls.sh) (alias runtest_tls.sh)
(alias runtest_cors.sh))))) (alias runtest_cors.sh)))

2
src/bin_client/test/test_tls.sh
View File

@ -4,6 +4,8 @@
set -e set -e
export USE_TLS=true
test_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)")" test_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)")"
source $test_dir/test_lib.inc.sh "$@" source $test_dir/test_lib.inc.sh "$@"

21
src/bin_node/dune
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(executable (executable
((name main) (name main)
(public_name tezos-node) (public_name tezos-node)
(libraries (tezos-base (libraries tezos-base
tezos-stdlib-unix tezos-stdlib-unix
tezos-shell-services tezos-shell-services
tezos-rpc-http tezos-rpc-http
@ -14,7 +12,7 @@
tezos-embedded-protocol-demo tezos-embedded-protocol-demo
tezos-embedded-protocol-alpha tezos-embedded-protocol-alpha
cmdliner cmdliner
tls)) tls)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
@ -24,13 +22,14 @@
-open Tezos_p2p -open Tezos_p2p
-open Tezos_shell -open Tezos_shell
-open Tezos_protocol_updater -open Tezos_protocol_updater
-linkall)))) -linkall)))
(install (install
((section bin) (section bin)
(files ((tezos-sandboxed-node.sh as tezos-sandboxed-node.sh))))) (files (tezos-sandboxed-node.sh as tezos-sandboxed-node.sh)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action
(run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

18
src/bin_signer/dune
View File

@ -1,16 +1,14 @@
(jbuild_version 1)
(executables (executables
((names (main_signer)) (names main_signer)
(public_names (tezos-signer)) (public_names tezos-signer)
(libraries (tezos-base (libraries tezos-base
tezos-client-base tezos-client-base
tezos-client-base-unix tezos-client-base-unix
tezos-client-commands tezos-client-commands
tezos-signer-services tezos-signer-services
tezos-rpc-http tezos-rpc-http
tezos-stdlib-unix tezos-stdlib-unix
tezos-signer-backends)) tezos-signer-backends)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
@ -19,9 +17,9 @@
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_signer_services -open Tezos_signer_services
-open Tezos_rpc_http -open Tezos_rpc_http
-open Tezos_stdlib_unix)))) -open Tezos_stdlib_unix)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

14
src/lib_base/dune
View File

@ -1,7 +1,5 @@
(jbuild_version 1)
(library (library
((name tezos_base) (name tezos_base)
(public_name tezos-base) (public_name tezos-base)
(flags (:standard -w -30 (flags (:standard -w -30
-open Tezos_stdlib -open Tezos_stdlib
@ -12,7 +10,7 @@
-open Tezos_clic -open Tezos_clic
-open Tezos_micheline -open Tezos_micheline
-safe-string)) -safe-string))
(libraries (tezos-stdlib (libraries tezos-stdlib
tezos-crypto tezos-crypto
tezos-data-encoding tezos-data-encoding
tezos-error-monad tezos-error-monad
@ -24,9 +22,9 @@
ezjsonm ezjsonm
lwt.unix lwt.unix
mtime.clock.os mtime.clock.os
ipaddr.unix)))) ipaddr.unix))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

14
src/lib_clic/dune
View File

@ -1,16 +1,14 @@
(jbuild_version 1)
(library (library
((name tezos_clic) (name tezos_clic)
(public_name tezos-clic) (public_name tezos-clic)
(flags (:standard -w -30 (flags (:standard -w -30
-safe-string -safe-string
-open Tezos_stdlib -open Tezos_stdlib
-open Tezos_error_monad)) -open Tezos_error_monad))
(libraries (tezos-stdlib (libraries tezos-stdlib
tezos-error-monad)))) tezos-error-monad))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_client_base/dune
View File

@ -1,19 +1,17 @@
(jbuild_version 1)
(library (library
((name tezos_client_base) (name tezos_client_base)
(public_name tezos-client-base) (public_name tezos-client-base)
(libraries (tezos-base (libraries tezos-base
tezos-shell-services tezos-shell-services
tezos-rpc)) tezos-rpc)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_rpc -open Tezos_rpc
-open Tezos_shell_services)))) -open Tezos_shell_services)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_client_base_unix/dune
View File

@ -1,15 +1,13 @@
(jbuild_version 1)
(library (library
((name tezos_client_base_unix) (name tezos_client_base_unix)
(public_name tezos-client-base-unix) (public_name tezos-client-base-unix)
(libraries (tezos-base (libraries tezos-base
tezos-client-base tezos-client-base
tezos-client-commands tezos-client-commands
tezos-stdlib-unix tezos-stdlib-unix
tezos-rpc-http tezos-rpc-http
tezos-signer-backends tezos-signer-backends
tezos-shell-services)) tezos-shell-services)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
@ -18,9 +16,9 @@
-open Tezos_stdlib_unix -open Tezos_stdlib_unix
-open Tezos_client_base -open Tezos_client_base
-open Tezos_client_commands -open Tezos_client_commands
-linkall)))) -linkall)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_client_commands/dune
View File

@ -1,22 +1,20 @@
(jbuild_version 1)
(library (library
((name tezos_client_commands) (name tezos_client_commands)
(public_name tezos-client-commands) (public_name tezos-client-commands)
(libraries (tezos-base (libraries tezos-base
tezos-client-base tezos-client-base
tezos-rpc tezos-rpc
tezos-shell-services tezos-shell-services
tezos-signer-backends)) tezos-signer-backends)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_rpc -open Tezos_rpc
-open Tezos_client_base -open Tezos_client_base
-open Tezos_shell_services)))) -open Tezos_shell_services)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

14
src/lib_crypto/dune
View File

@ -1,7 +1,5 @@
(jbuild_version 1)
(library (library
((name tezos_crypto) (name tezos_crypto)
(public_name tezos-crypto) (public_name tezos-crypto)
(flags (:standard -safe-string (flags (:standard -safe-string
-open Tezos_stdlib -open Tezos_stdlib
@ -9,7 +7,7 @@
-open Tezos_error_monad -open Tezos_error_monad
-open Tezos_rpc -open Tezos_rpc
-open Tezos_clic)) -open Tezos_clic))
(libraries (tezos-stdlib (libraries tezos-stdlib
tezos-data-encoding tezos-data-encoding
tezos-error-monad tezos-error-monad
tezos-rpc tezos-rpc
@ -19,9 +17,9 @@
hacl hacl
secp256k1 secp256k1
uecc uecc
zarith)))) zarith))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

46
src/lib_crypto/test/dune
View File

@ -1,49 +1,47 @@
(jbuild_version 1)
(executables (executables
((names (test_merkle (names test_merkle
test_base58 test_base58
test_ed25519 test_ed25519
test_blake2b)) test_blake2b)
(libraries (tezos-stdlib (libraries tezos-stdlib
tezos-crypto tezos-crypto
alcotest)) alcotest)
(flags (:standard -w -9-32 (flags (:standard -w -9-32
-safe-string -safe-string
-open Tezos_stdlib -open Tezos_stdlib
-open Tezos_crypto)))) -open Tezos_crypto)))
(alias (alias
((name buildtest) (name buildtest)
(deps (test_merkle.exe (deps test_merkle.exe
test_base58.exe test_base58.exe
test_ed25519.exe test_ed25519.exe
test_blake2b.exe)))) test_blake2b.exe))
(alias (alias
((name runtest_merkle) (name runtest_merkle)
(action (run ${exe:test_merkle.exe})))) (action (run %{exe:test_merkle.exe})))
(alias (alias
((name runtest_base58) (name runtest_base58)
(action (run ${exe:test_base58.exe})))) (action (run %{exe:test_base58.exe})))
(alias (alias
((name runtest_ed25519) (name runtest_ed25519)
(action (run ${exe:test_ed25519.exe})))) (action (run %{exe:test_ed25519.exe})))
(alias (alias
((name runtest_blake2b) (name runtest_blake2b)
(action (run ${exe:test_blake2b.exe})))) (action (run %{exe:test_blake2b.exe})))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest_merkle) (deps (alias runtest_merkle)
(alias runtest_base58) (alias runtest_base58)
(alias runtest_ed25519) (alias runtest_ed25519)
(alias runtest_blake2b))))) (alias runtest_blake2b)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_data_encoding/dune
View File

@ -1,18 +1,16 @@
(jbuild_version 1)
(library (library
((name tezos_data_encoding) (name tezos_data_encoding)
(public_name tezos-data-encoding) (public_name tezos-data-encoding)
(libraries (tezos-stdlib (libraries tezos-stdlib
ocplib-json-typed ocplib-json-typed
ocplib-json-typed-bson ocplib-json-typed-bson
zarith zarith
ezjsonm)) ezjsonm)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_stdlib)))) -open Tezos_stdlib)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

42
src/lib_data_encoding/test/dune
View File

@ -1,43 +1,41 @@
(jbuild_version 1)
(executables (executables
((names (test (names test
test_generated test_generated
bench_data_encoding bench_data_encoding
)) )
(libraries (tezos-stdlib (libraries tezos-stdlib
tezos_data_encoding tezos_data_encoding
alcotest alcotest
crowbar)) crowbar)
(flags (:standard -w -9-32 -safe-string (flags (:standard -w -9-32 -safe-string
-open Tezos_stdlib -open Tezos_stdlib
-open Tezos_data_encoding)))) -open Tezos_data_encoding)))
(alias (alias
((name buildtest) (name buildtest)
(deps (test.exe (deps test.exe
test_generated.exe test_generated.exe
bench_data_encoding.exe bench_data_encoding.exe
)))) ))
(alias (alias
((name runtest_test) (name runtest_test)
(action (run ${exe:test.exe})))) (action (run %{exe:test.exe})))
(alias (alias
((name runtest_test_generated) (name runtest_test_generated)
(action (run ${exe:test_generated.exe})))) (action (run %{exe:test_generated.exe})))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest_test) (deps (alias runtest_test)
(alias runtest_test_generated))))) (alias runtest_test_generated)))
(alias (alias
((name run_bench) (name run_bench)
(action (run ${exe:bench_data_encoding.exe})))) (action (run %{exe:bench_data_encoding.exe})))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

14
src/lib_error_monad/dune
View File

@ -1,16 +1,14 @@
(jbuild_version 1)
(library (library
((name tezos_error_monad) (name tezos_error_monad)
(public_name tezos-error-monad) (public_name tezos-error-monad)
(flags (:standard -open Tezos_stdlib (flags (:standard -open Tezos_stdlib
-open Tezos_data_encoding -open Tezos_data_encoding
-safe-string)) -safe-string))
(libraries (tezos-stdlib (libraries tezos-stdlib
tezos-data-encoding tezos-data-encoding
lwt)))) lwt))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_micheline/dune
View File

@ -1,10 +1,8 @@
(jbuild_version 1)
(library (library
((name tezos_micheline) (name tezos_micheline)
(public_name tezos-micheline) (public_name tezos-micheline)
(libraries (libraries
(
;; External ;; External
uutf uutf
zarith zarith
@ -12,14 +10,14 @@
tezos-stdlib tezos-stdlib
tezos-error-monad tezos-error-monad
tezos-data-encoding tezos-data-encoding
)) )
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_stdlib -open Tezos_stdlib
-open Tezos_error_monad -open Tezos_error_monad
-open Tezos_data_encoding)))) -open Tezos_data_encoding)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_p2p/dune
View File

@ -1,18 +1,16 @@
(jbuild_version 1)
(library (library
((name tezos_p2p) (name tezos_p2p)
(public_name tezos-p2p) (public_name tezos-p2p)
(libraries (tezos-base (libraries tezos-base
tezos-stdlib-unix tezos-stdlib-unix
tezos-shell-services)) tezos-shell-services)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix -open Tezos_stdlib_unix
-open Tezos_shell_services)))) -open Tezos_shell_services)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

74
src/lib_p2p/test/dune
View File

@ -1,94 +1,92 @@
(jbuild_version 1)
(executables (executables
((names (test_p2p_socket (names test_p2p_socket
test_p2p_pool test_p2p_pool
test_p2p_io_scheduler test_p2p_io_scheduler
test_p2p_peerset test_p2p_peerset
test_p2p_ipv6set test_p2p_ipv6set
test_p2p_banned_peers test_p2p_banned_peers
)) )
(libraries (tezos-base (libraries tezos-base
tezos-stdlib-unix tezos-stdlib-unix
tezos-shell-services tezos-shell-services
tezos-p2p tezos-p2p
alcotest-lwt)) alcotest-lwt)
(flags (:standard -w -9-32 (flags (:standard -w -9-32
-linkall -linkall
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix -open Tezos_stdlib_unix
-open Tezos_shell_services -open Tezos_shell_services
-open Tezos_p2p)))) -open Tezos_p2p)))
(alias (alias
((name buildtest) (name buildtest)
(deps (test_p2p_socket.exe (deps test_p2p_socket.exe
test_p2p_pool.exe test_p2p_pool.exe
test_p2p_io_scheduler.exe test_p2p_io_scheduler.exe
test_p2p_peerset.exe test_p2p_peerset.exe
test_p2p_ipv6set.exe test_p2p_ipv6set.exe
test_p2p_banned_peers.exe test_p2p_banned_peers.exe
)))) ))
(alias (alias
((name runtest_p2p_socket) (name runtest_p2p_socket)
(action (run ${exe:test_p2p_socket.exe} -v)))) (action (run %{exe:test_p2p_socket.exe} -v)))
(alias (alias
((name runtest_p2p_pool) (name runtest_p2p_pool)
(action (run ${exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v)))) (action (run %{exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v)))
(alias (alias
((name runtest_p2p_io_scheduler) (name runtest_p2p_io_scheduler)
(action (run ${exe:test_p2p_io_scheduler.exe} (action (run %{exe:test_p2p_io_scheduler.exe}
--delay 5 --clients 8 --delay 5 --clients 8
--max-upload-speed 262144 ;; 1 << 18 = 256kB --max-upload-speed 262144 ;; 1 << 18 = 256kB
--max-download-speed 1048576 ;; 1 << 20 = 1MB --max-download-speed 1048576 ;; 1 << 20 = 1MB
)))) )))
(alias (alias
((name runtest_p2p_socket_ipv4) (name runtest_p2p_socket_ipv4)
(action (run ${exe:test_p2p_socket.exe} -v (action (run %{exe:test_p2p_socket.exe} -v
--addr "::ffff:127.0.0.1")))) --addr "::ffff:127.0.0.1")))
(alias (alias
((name runtest_p2p_pool_ipv4) (name runtest_p2p_pool_ipv4)
(action (run ${exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v (action (run %{exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v
--addr "::ffff:127.0.0.1")))) --addr "::ffff:127.0.0.1")))
(alias (alias
((name runtest_p2p_io_scheduler_ipv4) (name runtest_p2p_io_scheduler_ipv4)
(action (run ${exe:test_p2p_io_scheduler.exe} (action (run %{exe:test_p2p_io_scheduler.exe}
--delay 5 --clients 8 --delay 5 --clients 8
--max-upload-speed 262144 ;; 1 << 18 = 256kB --max-upload-speed 262144 ;; 1 << 18 = 256kB
--max-download-speed 1048576 ;; 1 << 20 = 1MB --max-download-speed 1048576 ;; 1 << 20 = 1MB
--addr "::ffff:127.0.0.1" --addr "::ffff:127.0.0.1"
)))) )))
(alias (alias
((name runtest_p2p_ipv6set) (name runtest_p2p_ipv6set)
(action (run ${exe:test_p2p_ipv6set.exe} -v)))) (action (run %{exe:test_p2p_ipv6set.exe} -v)))
(alias (alias
((name runtest_p2p_peerset) (name runtest_p2p_peerset)
(action (run ${exe:test_p2p_peerset.exe} -v)))) (action (run %{exe:test_p2p_peerset.exe} -v)))
(alias (alias
((name runtest_p2p_banned_peers) (name runtest_p2p_banned_peers)
(action (run ${exe:test_p2p_banned_peers.exe} -v)))) (action (run %{exe:test_p2p_banned_peers.exe} -v)))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest_p2p_socket_ipv4) (deps (alias runtest_p2p_socket_ipv4)
(alias runtest_p2p_pool_ipv4) (alias runtest_p2p_pool_ipv4)
(alias runtest_p2p_io_scheduler_ipv4) (alias runtest_p2p_io_scheduler_ipv4)
(alias runtest_p2p_peerset) (alias runtest_p2p_peerset)
(alias runtest_p2p_ipv6set) (alias runtest_p2p_ipv6set)
(alias runtest_p2p_banned_peers) (alias runtest_p2p_banned_peers)
)))) ))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

94
src/lib_protocol_compiler/dune
View File

@ -1,116 +1,114 @@
(jbuild_version 1)
(rule (rule
((targets (embedded_cmis.ml)) (targets embedded_cmis.ml)
(action (action
(run ${bin:ocp-ocamlres} -format ocaml -o ${@} (run %{bin:ocp-ocamlres} -format ocaml -o %{targets}
${lib:stdlib:camlinternalFormatBasics.cmi} %{lib:stdlib:camlinternalFormatBasics.cmi}
${path:tezos_protocol_registerer__Registerer.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.cmi}
${lib:tezos-protocol-environment-sigs:tezos_protocol_environment_sigs__V1.cmi})))) %{lib:tezos-protocol-environment-sigs:tezos_protocol_environment_sigs__V1.cmi})))
(library (library
((name tezos_protocol_registerer) (name tezos_protocol_registerer)
(public_name tezos-protocol-compiler.registerer) (public_name tezos-protocol-compiler.registerer)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-environment-sigs)) tezos-protocol-environment-sigs)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-opaque -opaque
-open Tezos_base__TzPervasives)) -open Tezos_base__TzPervasives))
(modules (Registerer)))) (modules Registerer))
(library (library
((name tezos_protocol_compiler) (name tezos_protocol_compiler)
(public_name tezos-protocol-compiler) (public_name tezos-protocol-compiler)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-environment-sigs tezos-protocol-environment-sigs
tezos-stdlib-unix tezos-stdlib-unix
compiler-libs.common compiler-libs.common
lwt.unix lwt.unix
ocplib-endian ocplib-endian
ocplib-ocamlres ocplib-ocamlres
unix)) unix)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix)) -open Tezos_stdlib_unix))
(modules (Embedded_cmis Packer Compiler)))) (modules Embedded_cmis Packer Compiler))
(library (library
((name tezos_protocol_compiler_byte) (name tezos_protocol_compiler_byte)
(public_name tezos-protocol-compiler.byte) (public_name tezos-protocol-compiler.byte)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-compiler tezos-protocol-compiler
compiler-libs.bytecomp)) compiler-libs.bytecomp)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_protocol_compiler)) -open Tezos_protocol_compiler))
(modules (Byte)))) (modules Byte))
(library (library
((name tezos_protocol_compiler_native) (name tezos_protocol_compiler_native)
(public_name tezos-protocol-compiler.native) (public_name tezos-protocol-compiler.native)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-compiler tezos-protocol-compiler
compiler-libs.optcomp)) compiler-libs.optcomp)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_protocol_compiler)) -open Tezos_protocol_compiler))
(modules (Native)))) (modules Native))
(executable (executable
((name main_byte) (name main_byte)
(public_name tezos-protocol-compiler-byte) (public_name tezos-protocol-compiler-byte)
(modes (native)) (modes native)
(libraries (tezos_protocol_compiler_byte)) (libraries tezos_protocol_compiler_byte)
(flags (:standard -linkall)) (flags (:standard -linkall))
(modules (Main_byte)))) (modules Main_byte))
(executable (executable
((name main_native) (name main_native)
(public_name tezos-protocol-compiler) (public_name tezos-protocol-compiler)
(modes (native)) (modes native)
(libraries (tezos_protocol_compiler_native)) (libraries tezos_protocol_compiler_native)
(flags (:standard -linkall)) (flags (:standard -linkall))
(modules (Main_native)))) (modules Main_native))
(executable (executable
((name main_packer) (name main_packer)
(public_name tezos-protocol-compiler.tezos-protocol-packer) (public_name tezos-protocol-compiler.tezos-protocol-packer)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-compiler tezos-protocol-compiler
tezos-stdlib-unix)) tezos-stdlib-unix)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix -open Tezos_stdlib_unix
-open Tezos_protocol_compiler)) -open Tezos_protocol_compiler))
(modules (Main_packer)))) (modules Main_packer))
(executable (executable
((name main_embedded_packer) (name main_embedded_packer)
(public_name tezos-embedded-protocol-packer) (public_name tezos-embedded-protocol-packer)
(modes (native)) (modes native)
(libraries (tezos-base (libraries tezos-base
tezos-stdlib-unix)) tezos-stdlib-unix)
(flags (:standard -linkall (flags (:standard -linkall
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix)) -open Tezos_stdlib_unix))
(modules (Main_embedded_packer)))) (modules Main_embedded_packer))
(install (install
((section share) (section share)
(files (jbuild_protocol_template (files jbuild_protocol_template
jbuild_embedded_protocol_template)))) jbuild_embedded_protocol_template))
(alias (alias
((name runtest_indent) (name runtest_indent)
;; we would like (deps ((glob_files *.ml \ embedded_cmis.ml))) ;; we would like (deps ((glob_files *.ml \ embedded_cmis.ml)))
;; meanwhile, we hardcode the module list ;; meanwhile, we hardcode the module list
(deps ("embedded_cmis.mli" (deps "embedded_cmis.mli"
"main_embedded_packer.ml" "main_embedded_packer.ml"
"main_embedded_packer.mli" "main_embedded_packer.mli"
"main_byte.ml" "main_byte.ml"
@ -123,5 +121,5 @@
"packer.mli" "packer.mli"
"registerer.ml" "registerer.ml"
"registerer.mli" "registerer.mli"
)) )
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

40
src/lib_protocol_compiler/jbuild_embedded_protocol_template
View File

@ -18,34 +18,38 @@ let lib_version =
let version = String.concat "-" (String.split_on_char '_' lib_version) let version = String.concat "-" (String.split_on_char '_' lib_version)
let () = Format.kasprintf Jbuild_plugin.V1.send {| let () = Format.kasprintf Jbuild_plugin.V1.send {|
(jbuild_version 1)
(rule (rule
((targets (environment.ml)) (targets environment.ml)
(action (action
(write-file ${@@} (write-file %%{targets}
"include Tezos_protocol_environment_shell.MakeV1(struct let name = \"%s\" end)() "include Tezos_protocol_environment_shell.MakeV1(struct let name = \"%s\" end)()
module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
")))) ")))
(rule (rule
((targets (registerer.ml)) (targets registerer.mli)
(deps (tezos_embedded_protocol_environment_%s.cmxa TEZOS_PROTOCOL)) (action (write-file %%{targets} "(* empty *)")))
(rule
(targets registerer.ml)
(deps tezos_embedded_protocol_environment_%s.cmxa
(:src_dir TEZOS_PROTOCOL))
(action (action
(with-stdout-to ${@@} (with-stdout-to %%{targets}
(chdir ${ROOT} (run ${bin:tezos-embedded-protocol-packer} ${path-no-dep:.} "%s")))))) (chdir %%{workspace_root} (run %%{bin:tezos-embedded-protocol-packer} "%%{src_dir}" "%s")))))
(library (library
((name tezos_embedded_protocol_environment_%s) (name tezos_embedded_protocol_environment_%s)
(public_name tezos-embedded-protocol-%s.environment) (public_name tezos-embedded-protocol-%s.environment)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(libraries (tezos-protocol-environment-shell)) (libraries tezos-protocol-environment-shell)
(modules (Environment)))) (modules Environment))
(library (library
((name tezos_embedded_raw_protocol_%s) (name tezos_embedded_raw_protocol_%s)
(public_name tezos-embedded-protocol-%s.raw) (public_name tezos-embedded-protocol-%s.raw)
(libraries (tezos_embedded_protocol_environment_%s)) (libraries tezos_embedded_protocol_environment_%s)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(flags (:standard -nopervasives -nostdlib -safe-string (flags (:standard -nopervasives -nostdlib -safe-string
-w +a-4-6-7-9-29-32-40..42-44-45-48 -w +a-4-6-7-9-29-32-40..42-44-45-48
@ -53,18 +57,18 @@ let () = Format.kasprintf Jbuild_plugin.V1.send {|
-open Tezos_embedded_protocol_environment_%s__Environment -open Tezos_embedded_protocol_environment_%s__Environment
-open Pervasives -open Pervasives
-open Error_monad)) -open Error_monad))
(modules (:standard \ Environment Registerer)))) (modules :standard \ Environment Registerer))
(library (library
((name tezos_embedded_protocol_%s) (name tezos_embedded_protocol_%s)
(public_name tezos-embedded-protocol-%s) (public_name tezos-embedded-protocol-%s)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(libraries (tezos_embedded_raw_protocol_%s (libraries tezos_embedded_raw_protocol_%s
tezos-protocol-updater tezos-protocol-updater
tezos-protocol-environment-shell)) tezos-protocol-environment-shell)
(flags (:standard -w +a-4-6-7-9-29-32-40..42-44-45-48 (flags (:standard -w +a-4-6-7-9-29-32-40..42-44-45-48
-warn-error -a+8)) -warn-error -a+8))
(modules (Registerer)))) (modules Registerer))
|} |}
version lib_version lib_version lib_version version lib_version lib_version lib_version
version lib_version version lib_version version lib_version version lib_version

66
src/lib_protocol_compiler/jbuild_protocol_template
View File

@ -1,16 +1,5 @@
(* -*- tuareg -*- *) (* -*- 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 prefix = "proto_"
let dirname = Filename.basename @@ Filename.dirname @@ Sys.getcwd () let dirname = Filename.basename @@ Filename.dirname @@ Sys.getcwd ()
@ -34,54 +23,39 @@ let path =
| Some _ -> "." | Some _ -> "."
let sources = let sources =
let d = Unix.opendir "src" in Format.kasprintf
let rec loop acc = Jbuild_plugin.V1.run_and_read_lines
match Unix.readdir d with "find src -name \\*.ml -or -name \\*.mli"
| 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 []
let () = Format.kasprintf Jbuild_plugin.V1.send {| let () = Format.kasprintf Jbuild_plugin.V1.send {|
(jbuild_version 1)
(rule (rule
((targets (functor.ml)) (targets functor.ml)
(deps ((glob_files src/*.ml{,i}) (deps (glob_files src/*.ml{,i})
src/TEZOS_PROTOCOL)) (:src_dir src/TEZOS_PROTOCOL))
(action (with-stdout-to ${path-no-dep:functor.ml} (action (with-stdout-to %%{targets}
(chdir ${ROOT} (chdir %%{workspace_root}
(run ${bin:tezos-protocol-compiler.tezos-protocol-packer} ${path-no-dep:src})))))) (run %%{bin:tezos-protocol-compiler.tezos-protocol-packer} %%{src_dir})))))
(library (library
((name tezos_protocol_%s) (name tezos_protocol_%s)
(public_name tezos-protocol-%s) (public_name tezos-protocol-%s)
(libraries (tezos-protocol-environment-sigs)) (libraries tezos-protocol-environment-sigs)
(flags (-w "+a-4-6-7-9-29-40..42-44-45-48" (flags -w "+a-4-6-7-9-29-40..42-44-45-48"
-warn-error "-a+8" -warn-error "-a+8"
-safe-string -nopervasives)) -safe-string -nopervasives)
(modules (Functor)))) (modules Functor))
(alias (alias
((name runtest_sandbox) (name runtest_sandbox)
(deps (tezos_protocol_%s.cmx)))) (deps .tezos_protocol_%s.objs/tezos_protocol_%s.cmx))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps (@[<v>%a@])) (deps @[<v>%a@])
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (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")) Format.(pp_print_list (fun ppf -> Format.fprintf ppf "%S"))
sources sources

6
src/lib_protocol_compiler/main_embedded_packer.ml
View File

@ -26,6 +26,12 @@
let srcdir = Sys.argv.(1) let srcdir = Sys.argv.(1)
let version = Sys.argv.(2) let version = Sys.argv.(2)
let srcdir =
if Filename.basename srcdir = "TEZOS_PROTOCOL" then
Filename.dirname srcdir
else
srcdir
let hash, sources = let hash, sources =
match Lwt_main.run (Lwt_utils_unix.Protocol.read_dir srcdir) with match Lwt_main.run (Lwt_utils_unix.Protocol.read_dir srcdir) with
| Ok (None, proto) -> | Ok (None, proto) ->

2
src/lib_protocol_compiler/main_packer.ml
View File

@ -34,6 +34,8 @@ let () =
Arg.parse args_spec (fun s -> anonymous := s :: !anonymous) usage_msg ; Arg.parse args_spec (fun s -> anonymous := s :: !anonymous) usage_msg ;
let source_dir = let source_dir =
match List.rev !anonymous with match List.rev !anonymous with
| [ source_dir ] when Filename.basename source_dir = "TEZOS_PROTOCOL"->
Filename.dirname source_dir
| [ source_dir ] -> source_dir | [ source_dir ] -> source_dir
| _ -> Arg.usage args_spec usage_msg ; Pervasives.exit 1 in | _ -> Arg.usage args_spec usage_msg ; Pervasives.exit 1 in
let hash, protocol = let hash, protocol =

26
src/lib_protocol_environment/dune
View File

@ -1,31 +1,29 @@
(jbuild_version 1)
(library (library
((name tezos_protocol_environment) (name tezos_protocol_environment)
(public_name tezos-protocol-environment) (public_name tezos-protocol-environment)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-environment-sigs tezos-protocol-environment-sigs
tezos-micheline)) tezos-micheline)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_micheline)) -open Tezos_micheline))
(wrapped false) (wrapped false)
(modules (Tezos_protocol_environment (modules Tezos_protocol_environment
Tezos_protocol_environment_faked Tezos_protocol_environment_faked
Tezos_protocol_environment_memory)))) Tezos_protocol_environment_memory))
(library (library
((name tezos_protocol_environment_shell) (name tezos_protocol_environment_shell)
(public_name tezos-protocol-environment-shell) (public_name tezos-protocol-environment-shell)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-environment tezos-protocol-environment
tezos-storage)) tezos-storage)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string)) -safe-string))
(modules (Tezos_protocol_environment_shell)))) (modules Tezos_protocol_environment_shell))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_protocol_environment/sigs/dune
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(rule (rule
((targets (v1.ml)) (targets v1.ml)
(deps (deps
(
;; Part of OCaml stdlib ;; Part of OCaml stdlib
v1/pervasives.mli v1/pervasives.mli
v1/list.mli v1/list.mli
@ -61,13 +59,13 @@
v1/updater.mli v1/updater.mli
v1/RPC_context.mli v1/RPC_context.mli
)) )
(action (action
(with-stdout-to ${@} (with-stdout-to %{targets}
(chdir ${ROOT} (run ${exe:../sigs_packer/sigs_packer.exe} ${^})))))) (chdir %{workspace_root}} (run %{exe:../sigs_packer/sigs_packer.exe} %{deps})))))
(library (library
((name tezos_protocol_environment_sigs) (name tezos_protocol_environment_sigs)
(public_name tezos-protocol-environment-sigs) (public_name tezos-protocol-environment-sigs)
(flags (:standard -nopervasives -safe-string)) (flags (:standard -nopervasives -safe-string))
(modules ("V1")))) (modules ("V1")))

12
src/lib_protocol_environment/sigs_packer/dune
View File

@ -1,11 +1,9 @@
(jbuild_version 1)
(executable (executable
((name sigs_packer) (name sigs_packer)
(public_name tezos-protocol-environment-sigs.packer) (public_name tezos-protocol-environment-sigs.packer)
(package tezos-protocol-environment-sigs))) (package tezos-protocol-environment-sigs))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

24
src/lib_protocol_environment/test/dune
View File

@ -1,25 +1,23 @@
(jbuild_version 1)
(executables (executables
((names (test)) (names test)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-environment tezos-protocol-environment
alcotest-lwt)) alcotest-lwt)
(flags (:standard -w -9-32 (flags (:standard -w -9-32
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_protocol_environment)))) -open Tezos_protocol_environment)))
(alias (alias
((name buildtest) (name buildtest)
(deps (test.exe)))) (deps test.exe))
(alias (alias
((name runtest) (name runtest)
(package tezos-protocol-environment) (package tezos-protocol-environment)
(action (run ${exe:test.exe})))) (action (run %{exe:test.exe})))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_protocol_updater/dune
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(library (library
((name tezos_protocol_updater) (name tezos_protocol_updater)
(public_name tezos-protocol-updater) (public_name tezos-protocol-updater)
(libraries (tezos-base (libraries tezos-base
tezos-stdlib-unix tezos-stdlib-unix
tezos-micheline tezos-micheline
tezos-shell-services tezos-shell-services
@ -11,16 +9,16 @@
tezos-protocol-compiler.registerer tezos-protocol-compiler.registerer
tezos-protocol-compiler.native tezos-protocol-compiler.native
tezos-storage tezos-storage
dynlink)) dynlink)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix -open Tezos_stdlib_unix
-open Tezos_micheline -open Tezos_micheline
-open Tezos_shell_services -open Tezos_shell_services
-open Tezos_storage)))) -open Tezos_storage)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_rpc/dune
View File

@ -1,18 +1,16 @@
(jbuild_version 1)
(library (library
((name tezos_rpc) (name tezos_rpc)
(public_name tezos-rpc) (public_name tezos-rpc)
(libraries (tezos-data-encoding (libraries tezos-data-encoding
tezos-error-monad tezos-error-monad
ocplib-resto ocplib-resto
ocplib-resto-directory)) ocplib-resto-directory)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_data_encoding -open Tezos_data_encoding
-open Tezos_error_monad)))) -open Tezos_error_monad)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_rpc_http/dune
View File

@ -1,16 +1,14 @@
(jbuild_version 1)
(library (library
((name tezos_rpc_http) (name tezos_rpc_http)
(public_name tezos-rpc-http) (public_name tezos-rpc-http)
(libraries (tezos-base (libraries tezos-base
ocplib-resto-cohttp)) ocplib-resto-cohttp)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_rpc)))) -open Tezos_rpc)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

32
src/lib_shell/bench/dune
View File

@ -1,31 +1,29 @@
(jbuild_version 1)
(executables (executables
((names (bench_simple bench_tool)) (names bench_simple bench_tool)
(libraries (tezos-base (libraries tezos-base
tezos-shell tezos-shell
tezos_alpha_bench_helpers)) tezos_alpha_bench_helpers)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_shell -open Tezos_shell
-open Tezos_alpha_bench_helpers)))) -open Tezos_alpha_bench_helpers)))
(alias (alias
((name buildtest) (name buildtest)
(deps (bench_tool.exe bench_simple.exe)))) (deps bench_tool.exe bench_simple.exe))
(alias (alias
((name runbench_alpha_simple) (name runbench_alpha_simple)
(deps (bench_simple.exe)) (deps bench_simple.exe)
(action (chdir ${ROOT} (run ${exe:bench_simple.exe}))))) (action (chdir %{workspace_root} (run %{exe:bench_simple.exe}))))
(alias (alias
((name runbench_alpha) (name runbench_alpha)
(deps (bench_tool.exe)) (deps bench_tool.exe)
(action (chdir ${ROOT} (run ${exe:bench_tool.exe}))))) (action (chdir %{workspace_root} (run %{exe:bench_tool.exe}))))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml*))) (deps (glob_files *.ml*))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_shell/bench/helpers/dune
View File

@ -1,19 +1,17 @@
(jbuild_version 1)
(library (library
((name tezos_alpha_bench_helpers) (name tezos_alpha_bench_helpers)
(libraries (tezos-base (libraries tezos-base
tezos-stdlib-unix tezos-stdlib-unix
tezos-shell-services tezos-shell-services
tezos-protocol-environment tezos-protocol-environment
tezos-protocol-alpha tezos-protocol-alpha
alcotest-lwt)) alcotest-lwt)
(flags (:standard -w -9-32 -safe-string (flags (:standard -w -9-32 -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix -open Tezos_stdlib_unix
-open Tezos_shell_services)))) -open Tezos_shell_services)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml*))) (deps (glob_files *.ml*))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_shell/dune
View File

@ -1,14 +1,12 @@
(jbuild_version 1)
(library (library
((name tezos_shell) (name tezos_shell)
(public_name tezos-shell) (public_name tezos-shell)
(libraries (tezos-base (libraries tezos-base
tezos-storage tezos-storage
tezos-rpc-http tezos-rpc-http
tezos-p2p tezos-p2p
tezos-shell-services tezos-shell-services
tezos-protocol-updater)) tezos-protocol-updater)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
@ -16,9 +14,9 @@
-open Tezos_rpc_http -open Tezos_rpc_http
-open Tezos_p2p -open Tezos_p2p
-open Tezos_shell_services -open Tezos_shell_services
-open Tezos_protocol_updater)))) -open Tezos_protocol_updater)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

42
src/lib_shell/test/dune
View File

@ -1,16 +1,14 @@
(jbuild_version 1)
(executables (executables
((names (test (names test
test_locator)) test_locator)
(libraries (tezos-base (libraries tezos-base
tezos-storage tezos-storage
tezos-protocol-updater tezos-protocol-updater
tezos-shell tezos-shell
tezos-shell-services tezos-shell-services
tezos-embedded-protocol-demo tezos-embedded-protocol-demo
tezos-stdlib-unix tezos-stdlib-unix
alcotest-lwt)) alcotest-lwt)
(flags (:standard -w -9-32 (flags (:standard -w -9-32
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
@ -18,31 +16,31 @@
-open Tezos_protocol_updater -open Tezos_protocol_updater
-open Tezos_shell -open Tezos_shell
-open Tezos_shell_services -open Tezos_shell_services
-open Tezos_stdlib_unix)))) -open Tezos_stdlib_unix)))
(alias (alias
((name buildtest) (name buildtest)
(deps (test.exe (deps test.exe
test_locator.exe)))) test_locator.exe))
(alias (alias
((name runtest_shell) (name runtest_shell)
(action (run ${exe:test.exe})))) (action (run %{exe:test.exe})))
(alias (alias
((name runtest_locator) (name runtest_locator)
(action (run ${exe:test_locator.exe} --no-bench)))) (action (run %{exe:test_locator.exe} --no-bench)))
(alias (alias
((name runbench_locator) (name runbench_locator)
(action (run ${exe:test_locator.exe})))) (action (run %{exe:test_locator.exe})))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest_shell) (deps (alias runtest_shell)
(alias runtest_locator))))) (alias runtest_locator)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

14
src/lib_shell_services/dune
View File

@ -1,15 +1,13 @@
(jbuild_version 1)
(library (library
((name tezos_shell_services) (name tezos_shell_services)
(public_name tezos-shell-services) (public_name tezos-shell-services)
(libraries (tezos-base)) (libraries tezos-base)
(flags (:standard -w +27@8 (flags (:standard -w +27@8
-safe-string -safe-string
-linkall -linkall
-open Tezos_base__TzPervasives)))) -open Tezos_base__TzPervasives)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_signer_backends/dune
View File

@ -1,23 +1,21 @@
(jbuild_version 1)
(library (library
((name tezos_signer_backends) (name tezos_signer_backends)
(public_name tezos-signer-backends) (public_name tezos-signer-backends)
(libraries (tezos-base (libraries tezos-base
tezos-stdlib-unix tezos-stdlib-unix
tezos-client-base tezos-client-base
tezos-rpc-http tezos-rpc-http
tezos-signer-services tezos-signer-services
pbkdf pbkdf
bip39 bip39
ledgerwallet-tezos)) ledgerwallet-tezos)
(flags (:standard -open Tezos_base__TzPervasives (flags (:standard -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix -open Tezos_stdlib_unix
-open Tezos_client_base -open Tezos_client_base
-open Tezos_signer_services -open Tezos_signer_services
-open Tezos_rpc_http)))) -open Tezos_rpc_http)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

28
src/lib_signer_backends/test/dune
View File

@ -1,30 +1,28 @@
(jbuild_version 1)
(executables (executables
((names (test_encrypted)) (names test_encrypted)
(libraries (tezos-signer-backends (libraries tezos-signer-backends
alcotest-lwt)) alcotest-lwt)
(flags (:standard -w -9-32 (flags (:standard -w -9-32
-safe-string -safe-string
-open Tezos_error_monad -open Tezos_error_monad
-open Tezos_stdlib -open Tezos_stdlib
-open Tezos_crypto -open Tezos_crypto
-open Tezos_client_base -open Tezos_client_base
-open Tezos_signer_backends)))) -open Tezos_signer_backends)))
(alias (alias
((name buildtest) (name buildtest)
(deps (test_encrypted.exe)))) (deps test_encrypted.exe))
(alias (alias
((name runtest_signer_encrypted) (name runtest_signer_encrypted)
(action (run ${exe:test_encrypted.exe})))) (action (run %{exe:test_encrypted.exe})))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest_signer_encrypted))))) (deps (alias runtest_signer_encrypted)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_signer_services/dune
View File

@ -1,19 +1,17 @@
(jbuild_version 1)
(library (library
((name tezos_signer_services) (name tezos_signer_services)
(public_name tezos-signer-services) (public_name tezos-signer-services)
(libraries (tezos-base (libraries tezos-base
tezos-client-base tezos-client-base
tezos-rpc)) tezos-rpc)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_rpc -open Tezos_rpc
-open Tezos_client_base -open Tezos_client_base
-linkall)))) -linkall)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

20
src/lib_stdlib/dune
View File

@ -1,23 +1,21 @@
(jbuild_version 1)
(library (library
((name tezos_stdlib) (name tezos_stdlib)
(public_name tezos-stdlib) (public_name tezos-stdlib)
(libraries (ocplib-endian.bigstring (libraries ocplib-endian.bigstring
bigstring bigstring
cstruct cstruct
hex hex
re re
zarith zarith
lwt lwt
lwt.log)) lwt.log)
(flags (:standard -safe-string)))) (flags (:standard -safe-string)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${path:test-ocp-indent.sh} ${^})))) (action (run bash %{dep:test-ocp-indent.sh} %{deps})))
(install (install
((section libexec) (section libexec)
(files ((test-ocp-indent.sh as test-ocp-indent.sh))))) (files (test-ocp-indent.sh as test-ocp-indent.sh)))

38
src/lib_stdlib/test/dune
View File

@ -1,34 +1,32 @@
(jbuild_version 1)
(executables (executables
((names (test_tzList (names test_tzList
test_lwt_pipe)) test_lwt_pipe)
(libraries (tezos-stdlib (libraries tezos-stdlib
alcotest alcotest
lwt.unix)) lwt.unix)
(flags (:standard -w -9-32 (flags (:standard -w -9-32
-safe-string -safe-string
-open Tezos_stdlib)))) -open Tezos_stdlib)))
(alias (alias
((name buildtest) (name buildtest)
(deps (test_tzList.exe (deps test_tzList.exe
test_lwt_pipe.exe)))) test_lwt_pipe.exe))
(alias (alias
((name runtest_tzList) (name runtest_tzList)
(action (run ${exe:test_tzList.exe})))) (action (run %{exe:test_tzList.exe})))
(alias (alias
((name runtest_lwt_pipe) (name runtest_lwt_pipe)
(action (run ${exe:test_lwt_pipe.exe})))) (action (run %{exe:test_lwt_pipe.exe})))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest_tzList) (deps (alias runtest_tzList)
(alias runtest_lwt_pipe))))) (alias runtest_lwt_pipe)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

14
src/lib_stdlib_unix/dune
View File

@ -1,17 +1,15 @@
(jbuild_version 1)
(library (library
((name tezos_stdlib_unix) (name tezos_stdlib_unix)
(public_name tezos-stdlib-unix) (public_name tezos-stdlib-unix)
(flags (:standard -w -9-30 (flags (:standard -w -9-30
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-safe-string)) -safe-string))
(libraries (tezos-base (libraries tezos-base
lwt.unix lwt.unix
ipaddr.unix ipaddr.unix
str)))) str))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/lib_storage/dune
View File

@ -1,16 +1,14 @@
(jbuild_version 1)
(library (library
((name tezos_storage) (name tezos_storage)
(public_name tezos-storage) (public_name tezos-storage)
(libraries (tezos-base (libraries tezos-base
lmdb lmdb
irmin-lmdb)) irmin-lmdb)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives)))) -open Tezos_base__TzPervasives)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

24
src/lib_storage/test/dune
View File

@ -1,26 +1,24 @@
(jbuild_version 1)
(executables (executables
((names (test)) (names test)
(libraries (tezos-base (libraries tezos-base
tezos-storage tezos-storage
tezos-stdlib-unix tezos-stdlib-unix
alcotest-lwt)) alcotest-lwt)
(flags (:standard -w -9-32 (flags (:standard -w -9-32
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_storage -open Tezos_storage
-open Tezos_stdlib_unix)))) -open Tezos_stdlib_unix)))
(alias (alias
((name buildtest) (name buildtest)
(deps (test.exe)))) (deps test.exe))
(alias (alias
((name runtest) (name runtest)
(action (chdir ${ROOT} (run ${exe:test.exe}))))) (action (chdir %{workspace_root} (run %{exe:test.exe}))))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/proto_alpha/bin_accuser/dune
View File

@ -1,20 +1,18 @@
(jbuild_version 1)
(executable (executable
((name main_accuser_alpha) (name main_accuser_alpha)
(public_name tezos-accuser-alpha) (public_name tezos-accuser-alpha)
(libraries (tezos-client-base-unix (libraries tezos-client-base-unix
tezos-client-commands tezos-client-commands
tezos-baking-alpha-commands)) tezos-baking-alpha-commands)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_client_alpha -open Tezos_client_alpha
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_baking_alpha_commands -open Tezos_baking_alpha_commands
-open Tezos_client_base_unix)))) -open Tezos_client_base_unix)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/proto_alpha/bin_baker/dune
View File

@ -1,20 +1,18 @@
(jbuild_version 1)
(executable (executable
((name main_baker_alpha) (name main_baker_alpha)
(public_name tezos-baker-alpha) (public_name tezos-baker-alpha)
(libraries (tezos-client-base-unix (libraries tezos-client-base-unix
tezos-client-commands tezos-client-commands
tezos-baking-alpha-commands)) tezos-baking-alpha-commands)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_client_alpha -open Tezos_client_alpha
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_baking_alpha_commands -open Tezos_baking_alpha_commands
-open Tezos_client_base_unix)))) -open Tezos_client_base_unix)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/proto_alpha/bin_endorser/dune
View File

@ -1,20 +1,18 @@
(jbuild_version 1)
(executable (executable
((name main_endorser_alpha) (name main_endorser_alpha)
(public_name tezos-endorser-alpha) (public_name tezos-endorser-alpha)
(libraries (tezos-client-base-unix (libraries tezos-client-base-unix
tezos-client-commands tezos-client-commands
tezos-baking-alpha-commands)) tezos-baking-alpha-commands)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_client_alpha -open Tezos_client_alpha
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_baking_alpha_commands -open Tezos_baking_alpha_commands
-open Tezos_client_base_unix)))) -open Tezos_client_base_unix)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/proto_alpha/lib_client/dune
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(library (library
((name tezos_client_alpha) (name tezos_client_alpha)
(public_name tezos-client-alpha) (public_name tezos-client-alpha)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-alpha tezos-protocol-alpha
tezos-protocol-environment tezos-protocol-environment
tezos-shell-services tezos-shell-services
@ -11,7 +9,7 @@
tezos-rpc tezos-rpc
tezos-storage tezos-storage
tezos-signer-backends tezos-signer-backends
bip39)) bip39)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
@ -19,9 +17,9 @@
-open Tezos_shell_services -open Tezos_shell_services
-open Tezos_client_base -open Tezos_client_base
-open Tezos_storage -open Tezos_storage
-open Tezos_rpc)))) -open Tezos_rpc)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

26
src/proto_alpha/lib_client_commands/dune
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(library (library
((name tezos_client_alpha_commands) (name tezos_client_alpha_commands)
(public_name tezos-client-alpha-commands) (public_name tezos-client-alpha-commands)
(libraries (tezos-base (libraries tezos-base
tezos-stdlib-unix tezos-stdlib-unix
tezos-protocol-alpha tezos-protocol-alpha
tezos-protocol-environment tezos-protocol-environment
@ -11,7 +9,7 @@
tezos-client-base tezos-client-base
tezos-client-alpha tezos-client-alpha
tezos-client-commands tezos-client-commands
tezos-rpc)) tezos-rpc)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(modules (:standard \ alpha_commands_registration)) (modules (:standard \ alpha_commands_registration))
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
@ -22,12 +20,12 @@
-open Tezos_client_base -open Tezos_client_base
-open Tezos_client_alpha -open Tezos_client_alpha
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_rpc)))) -open Tezos_rpc)))
(library (library
((name tezos_client_alpha_commands_registration) (name tezos_client_alpha_commands_registration)
(public_name tezos-client-alpha-commands.registration) (public_name tezos-client-alpha-commands.registration)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-alpha tezos-protocol-alpha
tezos-protocol-environment tezos-protocol-environment
tezos-shell-services tezos-shell-services
@ -35,9 +33,9 @@
tezos-client-alpha tezos-client-alpha
tezos-client-commands tezos-client-commands
tezos-client-alpha-commands tezos-client-alpha-commands
tezos-rpc)) tezos-rpc)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(modules (alpha_commands_registration)) (modules alpha_commands_registration)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
@ -46,9 +44,9 @@
-open Tezos_client_alpha -open Tezos_client_alpha
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_client_alpha_commands -open Tezos_client_alpha_commands
-open Tezos_rpc)))) -open Tezos_rpc)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

36
src/proto_alpha/lib_delegate/dune
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(library (library
((name tezos_baking_alpha) (name tezos_baking_alpha)
(public_name tezos-baking-alpha) (public_name tezos-baking-alpha)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-alpha tezos-protocol-alpha
tezos-protocol-environment tezos-protocol-environment
tezos-shell-services tezos-shell-services
@ -11,7 +9,7 @@
tezos-client-alpha tezos-client-alpha
tezos-client-commands tezos-client-commands
tezos-storage tezos-storage
tezos-rpc)) tezos-rpc)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(modules (:standard \ (modules (:standard \
delegate_commands delegate_commands
@ -24,21 +22,21 @@
-open Tezos_client_alpha -open Tezos_client_alpha
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_storage -open Tezos_storage
-open Tezos_rpc)))) -open Tezos_rpc)))
(library (library
((name tezos_baking_alpha_commands) (name tezos_baking_alpha_commands)
(public_name tezos-baking-alpha-commands) (public_name tezos-baking-alpha-commands)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-alpha tezos-protocol-alpha
tezos-protocol-environment tezos-protocol-environment
tezos-shell-services tezos-shell-services
tezos-client-base tezos-client-base
tezos-client-alpha tezos-client-alpha
tezos-client-commands tezos-client-commands
tezos-baking-alpha)) tezos-baking-alpha)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(modules (delegate_commands)) (modules delegate_commands)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
@ -47,12 +45,12 @@
-open Tezos_client_alpha -open Tezos_client_alpha
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_baking_alpha -open Tezos_baking_alpha
-open Tezos_rpc)))) -open Tezos_rpc)))
(library (library
((name tezos_baking_alpha_commands_registration) (name tezos_baking_alpha_commands_registration)
(public_name tezos-baking-alpha-commands.registration) (public_name tezos-baking-alpha-commands.registration)
(libraries (tezos-base (libraries tezos-base
tezos-protocol-alpha tezos-protocol-alpha
tezos-protocol-environment tezos-protocol-environment
tezos-shell-services tezos-shell-services
@ -61,9 +59,9 @@
tezos-client-commands tezos-client-commands
tezos-baking-alpha tezos-baking-alpha
tezos-baking-alpha-commands tezos-baking-alpha-commands
tezos-rpc)) tezos-rpc)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(modules (delegate_commands_registration)) (modules delegate_commands_registration)
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
@ -73,9 +71,9 @@
-open Tezos_client_commands -open Tezos_client_commands
-open Tezos_baking_alpha -open Tezos_baking_alpha
-open Tezos_baking_alpha_commands -open Tezos_baking_alpha_commands
-open Tezos_rpc)))) -open Tezos_rpc)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

46
src/proto_alpha/lib_delegate/test/dune
View File

@ -1,10 +1,8 @@
(jbuild_version 1)
(executables (executables
((names (test_michelson_parser (names test_michelson_parser
test_rpc test_rpc
test_vote)) test_vote)
(libraries (tezos-base (libraries tezos-base
tezos-rpc-http tezos-rpc-http
tezos-shell-services tezos-shell-services
tezos-client-base tezos-client-base
@ -13,7 +11,7 @@
tezos-baking-alpha tezos-baking-alpha
tezos-client-base-unix tezos-client-base-unix
tezos-signer-backends tezos-signer-backends
alcotest-lwt)) alcotest-lwt)
(flags (:standard -w -9-32 -safe-string (flags (:standard -w -9-32 -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_rpc_http -open Tezos_rpc_http
@ -22,35 +20,35 @@
-open Tezos_client_genesis -open Tezos_client_genesis
-open Tezos_client_alpha -open Tezos_client_alpha
-open Tezos_baking_alpha -open Tezos_baking_alpha
-open Tezos_client_base_unix)))) -open Tezos_client_base_unix)))
(alias (alias
((name buildtest) (name buildtest)
(deps (test_michelson_parser.exe (deps test_michelson_parser.exe
test_rpc.exe test_rpc.exe
test_vote.exe)))) test_vote.exe))
(alias (alias
((name runtest_michelson_parser) (name runtest_michelson_parser)
(action (run ${exe:test_michelson_parser.exe})))) (action (run %{exe:test_michelson_parser.exe})))
(alias (alias
((name runtest_vote) (name runtest_vote)
(locks (/tcp-port/18400)) (locks /tcp-port/18400)
(action (chdir ${ROOT} (run ${exe:test_vote.exe} ${bin:tezos-node} 18400))))) (action (chdir %{workspace_root} (run %{exe:test_vote.exe} %{bin:tezos-node} 18400))))
(alias (alias
((name runtest_rpc) (name runtest_rpc)
(locks (/tcp-port/18500)) (locks /tcp-port/18500)
(action (chdir ${ROOT} (run ${exe:test_rpc.exe} ${bin:tezos-node} 18500))))) (action (chdir %{workspace_root} (run %{exe:test_rpc.exe} %{bin:tezos-node} 18500))))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest_michelson_parser) (deps (alias runtest_michelson_parser)
(alias runtest_rpc) (alias runtest_rpc)
(alias runtest_vote))))) (alias runtest_vote)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

32
src/proto_alpha/lib_protocol/test/dune
View File

@ -1,8 +1,6 @@
(jbuild_version 1)
(executable (executable
((name main) (name main)
(libraries (tezos-base (libraries tezos-base
tezos-micheline tezos-micheline
tezos-protocol-environment tezos-protocol-environment
alcotest-lwt alcotest-lwt
@ -10,36 +8,36 @@
michelson_parser michelson_parser
tezos-stdlib-unix tezos-stdlib-unix
bip39 bip39
)) )
(flags (:standard -w -9-32 -safe-string (flags (:standard -w -9-32 -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_micheline -open Tezos_micheline
-open Tezos_alpha_test_helpers -open Tezos_alpha_test_helpers
)))) )))
(alias (alias
((name buildtest) (name buildtest)
(package tezos-protocol-alpha) (package tezos-protocol-alpha)
(deps (main.exe)))) (deps main.exe))
; runs only the `Quick tests ; runs only the `Quick tests
(alias (alias
((name runtest_proto_alpha) (name runtest_proto_alpha)
(package tezos-protocol-alpha) (package tezos-protocol-alpha)
(action (chdir ${ROOT} (run ${exe:main.exe} -v -q))))) (action (chdir %{workspace_root} (run %{exe:main.exe} -v -q))))
; runs both `Quick and `Slow tests ; runs both `Quick and `Slow tests
(alias (alias
((name runtest_slow) (name runtest_slow)
(package tezos-protocol-alpha) (package tezos-protocol-alpha)
(action (chdir ${ROOT} (run ${exe:main.exe} -v))))) (action (chdir %{workspace_root} (run %{exe:main.exe} -v))))
(alias (alias
((name runtest) (name runtest)
(package tezos-protocol-alpha) (package tezos-protocol-alpha)
(deps ((alias runtest_proto_alpha))))) (deps (alias runtest_proto_alpha)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml*))) (deps (glob_files *.ml*))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

16
src/proto_alpha/lib_protocol/test/helpers/dune
View File

@ -1,19 +1,17 @@
(jbuild_version 1)
(library (library
((name tezos_alpha_test_helpers) (name tezos_alpha_test_helpers)
(libraries (tezos-base (libraries tezos-base
tezos-stdlib-unix tezos-stdlib-unix
tezos-shell-services tezos-shell-services
tezos-protocol-environment tezos-protocol-environment
tezos-protocol-alpha tezos-protocol-alpha
alcotest-lwt)) alcotest-lwt)
(flags (:standard -w -9-32 -safe-string (flags (:standard -w -9-32 -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_stdlib_unix -open Tezos_stdlib_unix
-open Tezos_shell_services)))) -open Tezos_shell_services)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml*))) (deps (glob_files *.ml*))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

17
src/proto_alpha/lib_protocol/test/michelson_parser/dune
View File

@ -1,15 +1,12 @@
(jbuild_version 1)
(library (library
((name michelson_parser) (name michelson_parser)
(libraries (tezos-base (libraries tezos-base
tezos_alpha_test_helpers tezos_alpha_test_helpers)
))
(flags (:standard -w -9-32 -safe-string (flags (:standard -w -9-32 -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_alpha_test_helpers)))) -open Tezos_alpha_test_helpers)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml*))) (deps (glob_files *.ml*))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

6
src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam
View File

@ -14,9 +14,9 @@ depends: [
"tezos-protocol-updater" "tezos-protocol-updater"
] ]
build: [ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "dune" "src/dune" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/dune" ]
[ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "src/jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "src/dune" ]
[ "dune" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [

6
src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam
View File

@ -18,9 +18,9 @@ depends: [
"bip39" { test } "bip39" { test }
] ]
build: [ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "dune" "src/dune" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "dune" ]
[ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "dune" ]
[ "dune" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [

6
src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam
View File

@ -13,9 +13,9 @@ depends: [
"tezos-protocol-updater" "tezos-protocol-updater"
] ]
build: [ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "dune" "src/dune" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/dune" ]
[ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "src/jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "src/dune" ]
[ "dune" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [

6
src/proto_demo/lib_protocol/tezos-protocol-demo.opam
View File

@ -12,9 +12,9 @@ depends: [
"tezos-protocol-compiler" "tezos-protocol-compiler"
] ]
build: [ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "dune" "src/dune" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "dune" ]
[ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "dune" ]
[ "dune" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [

16
src/proto_genesis/lib_client/dune
View File

@ -1,24 +1,22 @@
(jbuild_version 1)
(library (library
((name tezos_client_genesis) (name tezos_client_genesis)
(public_name tezos-client-genesis) (public_name tezos-client-genesis)
(libraries (tezos-base (libraries tezos-base
tezos-shell-services tezos-shell-services
tezos-client-base tezos-client-base
tezos-client-commands tezos-client-commands
tezos-protocol-environment tezos-protocol-environment
tezos-protocol-genesis tezos-protocol-genesis
tezos-protocol-alpha)) tezos-protocol-alpha)
(library_flags (:standard -linkall)) (library_flags (:standard -linkall))
(flags (:standard -w -9+27-30-32-40@8 (flags (:standard -w -9+27-30-32-40@8
-safe-string -safe-string
-open Tezos_base__TzPervasives -open Tezos_base__TzPervasives
-open Tezos_shell_services -open Tezos_shell_services
-open Tezos_client_base -open Tezos_client_base
-open Tezos_client_commands)))) -open Tezos_client_commands)))
(alias (alias
((name runtest_indent) (name runtest_indent)
(deps ((glob_files *.ml{,i}))) (deps (glob_files *.ml{,i}))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^})))) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))

6
src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam
View File

@ -13,9 +13,9 @@ depends: [
"tezos-protocol-updater" "tezos-protocol-updater"
] ]
build: [ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "dune" "src/dune" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/dune" ]
[ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "src/jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "src/dune" ]
[ "dune" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [

6
src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam
View File

@ -12,9 +12,9 @@ depends: [
"tezos-protocol-compiler" "tezos-protocol-compiler"
] ]
build: [ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "dune" "src/dune" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "dune" ]
[ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "dune" ]
[ "dune" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [

8
vendors/irmin-lmdb/dune vendored
View File

@ -1,7 +1,5 @@
(jbuild_version 1)
(library (library
((name irmin_lmdb) (name irmin_lmdb)
(public_name irmin-lmdb) (public_name irmin-lmdb)
(libraries (irmin lmdb)) (libraries irmin lmdb)
(flags (:standard -safe-string)))) (flags (:standard -safe-string)))

21
vendors/ocaml-bip39/src/dune vendored
View File

@ -1,17 +1,16 @@
(jbuild_version 1)
(library (library
((name bip39) (name bip39)
(public_name bip39) (public_name bip39)
(modules (english bip39)) (modules english bip39)
(libraries (nocrypto pbkdf)))) (libraries nocrypto pbkdf))
(rule (rule
((targets (english.ml)) (targets english.ml)
(deps (generator.exe (files_recursively_in ../gen))) (deps (:exe generator.exe)
(action (run ${<} ${@})))) (source_tree ../gen))
(action (run %{exe} %{targets})))
(executable (executable
((name generator) (name generator)
(modules (generator)) (modules generator)
(libraries (stdio)))) (libraries stdio))

10
vendors/ocaml-bip39/test/dune vendored
View File

@ -1,8 +1,8 @@
(executable (executable
((name test) (name test)
(libraries (bip39 hex alcotest)))) (libraries bip39 hex alcotest))
(alias (alias
((name runtest-bip39) (name runtest-bip39)
(deps (test.exe)) (deps (:exe test.exe))
(action (run ${<})))) (action (run %{exe})))

10
vendors/ocaml-blake2/src/dune vendored
View File

@ -1,8 +1,6 @@
(jbuild_version 1)
(library (library
((name blake2) (name blake2)
(public_name blake2) (public_name blake2)
(libraries (bigstring)) (libraries bigstring)
(c_names (blake2b-ref)) (c_names blake2b-ref)
(c_flags (-O3)))) (c_flags (-O3)))

15
vendors/ocaml-blake2/test/dune vendored
View File

@ -1,14 +1,11 @@
(jbuild_version 1)
(executable (executable
((name test) (name test)
(libraries (blake2 hex alcotest)))) (libraries blake2 hex alcotest))
(alias (alias
((name runtest-blake2) (name runtest-blake2)
(deps (test.exe)) (action (run %{exe:test.exe})))
(action (run ${<}))))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest-blake2))))) (deps (alias runtest-blake2)))

6
vendors/ocaml-hacl/src/config/dune vendored
View File

@ -1,5 +1,3 @@
(jbuild_version 1)
(executable (executable
((name discover) (name discover)
(libraries (base stdio)))) (libraries base stdio))

17
vendors/ocaml-hacl/src/dune vendored
View File

@ -1,10 +1,8 @@
(jbuild_version 1)
(library (library
((name hacl) (name hacl)
(public_name hacl) (public_name hacl)
(libraries (bigstring ocplib-endian.bigstring zarith)) (libraries bigstring ocplib-endian.bigstring zarith)
(c_names (hacl_stubs (c_names hacl_stubs
kremlib kremlib
FStar FStar
Hacl_Policies Hacl_Policies
@ -21,12 +19,11 @@
Hacl_HMAC_SHA2_256 Hacl_HMAC_SHA2_256
Hacl_Salsa20 Hacl_Salsa20
NaCl NaCl
Hacl_Unverified_Random)) Hacl_Unverified_Random)
(c_flags (:include c_flags.sexp)) (c_flags (:include c_flags.sexp))
)) )
; sets flags for 32/64 bits architectures ; sets flags for 32/64 bits architectures
(rule (rule
((targets (c_flags.sexp)) (targets c_flags.sexp)
(deps (config/discover.exe)) (action (run %{exe:config/discover.exe} -ocamlc %{ocamlc})))
(action (run ${<} -ocamlc ${OCAMLC}))))

15
vendors/ocaml-hacl/test/dune vendored
View File

@ -1,14 +1,11 @@
(jbuild_version 1)
(executable (executable
((name test) (name test)
(libraries (hex hacl alcotest)))) (libraries hex hacl alcotest))
(alias (alias
((name runtest-hacl) (name runtest-hacl)
(deps (test.exe)) (action (run %{exe:test.exe})))
(action (run ${<}))))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest-hacl))))) (deps (alias runtest-hacl)))

14
vendors/ocaml-ledger-wallet/src/dune vendored
View File

@ -1,15 +1,13 @@
(jbuild_version 1)
(library (library
((name ledgerwallet) (name ledgerwallet)
(public_name ledgerwallet) (public_name ledgerwallet)
(modules (Apdu Transport)) (modules Apdu Transport)
(synopsis "Ledger wallet library for OCaml: common parts") (synopsis "Ledger wallet library for OCaml: common parts")
(libraries (rresult cstruct hidapi)))) (libraries rresult cstruct hidapi))
(library (library
((name ledgerwallet_tezos) (name ledgerwallet_tezos)
(public_name ledgerwallet-tezos) (public_name ledgerwallet-tezos)
(modules (Ledgerwallet_tezos)) (modules Ledgerwallet_tezos)
(synopsis "Ledger wallet library for OCaml: Tezos app") (synopsis "Ledger wallet library for OCaml: Tezos app")
(libraries (ledgerwallet)))) (libraries ledgerwallet))

11
vendors/ocaml-ledger-wallet/test/dune vendored
View File

@ -1,9 +1,8 @@
(executable (executable
((name test_tezos) (name test_tezos)
(modules (Test_tezos)) (modules Test_tezos)
(libraries (hex alcotest ledgerwallet-tezos tweetnacl uecc)))) (libraries hex alcotest ledgerwallet-tezos tweetnacl uecc))
(alias (alias
((name runtest-ledgerwallet-tezos) (name runtest-ledgerwallet-tezos)
(deps (test_tezos.exe)) (action (run %{exe:test_tezos.exe})))
(action (run ${<}))))

4
vendors/ocaml-lmdb/config/dune vendored
View File

@ -1,4 +1,2 @@
(jbuild_version 1)
(executable (executable
((name discover))) (name discover))

15
vendors/ocaml-lmdb/src/dune vendored
View File

@ -1,14 +1,11 @@
(jbuild_version 1)
(library (library
((name lmdb) (name lmdb)
(public_name lmdb) (public_name lmdb)
(libraries (rresult)) (libraries rresult)
(c_names (mdb midl lmdb_stubs)) (c_names mdb midl lmdb_stubs)
(c_flags (:include c_flags.sexp)) (c_flags (:include c_flags.sexp))
(c_library_flags (-lpthread)))) (c_library_flags (-lpthread)))
(rule (rule
((targets (c_flags.sexp)) (targets c_flags.sexp)
(deps (../config/discover.exe)) (action (run %{exe:../config/discover.exe} -ocamlc %{ocamlc})))
(action (run ${<} -ocamlc ${OCAMLC}))))

11
vendors/ocaml-lmdb/test/dune vendored
View File

@ -1,10 +1,7 @@
(jbuild_version 1)
(executable (executable
((name test) (name test)
(libraries (cstruct rresult lmdb alcotest)))) (libraries cstruct rresult lmdb alcotest))
(alias (alias
((name runtest-lmdb) (name runtest-lmdb)
(deps (test.exe)) (action (run %{exe:test.exe})))
(action (run ${<}))))

6
vendors/ocaml-pbkdf/src/dune vendored
View File

@ -1,7 +1,5 @@
(jbuild_version 1)
(library (library
((name pbkdf) (name pbkdf)
(public_name pbkdf) (public_name pbkdf)
(synopsis "") (synopsis "")
(libraries (nocrypto)))) (libraries nocrypto))

11
vendors/ocaml-pbkdf/test/dune vendored
View File

@ -1,10 +1,7 @@
(jbuild_version 1)
(executable (executable
((name pbkdf_tests) (name pbkdf_tests)
(libraries (pbkdf alcotest)))) (libraries pbkdf alcotest))
(alias (alias
((name runtest-pbkdf) (name runtest-pbkdf)
(deps (pbkdf_tests.exe)) (action (run %{exe:pbkdf_tests.exe})))
(action (run ${<}))))

10
vendors/ocaml-secp256k1/config/dune vendored
View File

@ -1,11 +1,9 @@
(jbuild_version 1)
(library (library
((name config) (name config)
(modules config) (modules config)
(c_names (config_stubs)))) (c_names config_stubs))
(executable (executable
((name discover) (name discover)
(modules discover) (modules discover)
(libraries (config)))) (libraries config))

19
vendors/ocaml-secp256k1/src/dune vendored
View File

@ -1,16 +1,13 @@
(jbuild_version 1)
(library (library
((name libsecp256k1) (name libsecp256k1)
(public_name secp256k1) (public_name secp256k1)
(modules (internal external)) (modules internal external)
(libraries (bigstring cstruct)) (libraries bigstring cstruct)
(c_names (secp256k1 (c_names secp256k1
secp256k1_wrap)) secp256k1_wrap)
(c_flags (:include c_flags.sexp)) (c_flags (:include c_flags.sexp))
(c_library_flags (-lgmp)))) (c_library_flags (-lgmp)))
(rule (rule
((targets (c_flags.sexp)) (targets c_flags.sexp)
(deps (../config/discover.exe)) (action (run %{exe:../config/discover.exe} -ocamlc %{ocaml})))
(action (run ${<} -ocamlc ${OCAMLC}))))

15
vendors/ocaml-secp256k1/test/dune vendored
View File

@ -1,14 +1,11 @@
(jbuild_version 1)
(executable (executable
((name test) (name test)
(libraries (hex libsecp256k1 alcotest)))) (libraries hex libsecp256k1 alcotest))
(alias (alias
((name runtest-secp256k1) (name runtest-secp256k1)
(deps (test.exe)) (action (run %{exe:test.exe})))
(action (run ${<}))))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest-secp256k1))))) (deps (alias runtest-secp256k1)))

8
vendors/ocaml-uecc/src/dune vendored
View File

@ -1,12 +1,10 @@
(jbuild_version 1)
(library (library
((name uecc) (name uecc)
(public_name uecc) (public_name uecc)
(synopsis "ECDH and ECDSA for 8-bit, 32-bit, and 64-bit processors.") (synopsis "ECDH and ECDSA for 8-bit, 32-bit, and 64-bit processors.")
(c_names (uECC uecc_stubs)) (c_names uECC uecc_stubs)
(c_flags (-O3 (c_flags (-O3
-DuECC_OPTIMIZATION_LEVEL=3 -DuECC_OPTIMIZATION_LEVEL=3
-DuECC_SQUARE_FUNC=1 -DuECC_SQUARE_FUNC=1
-DuECC_VLI_NATIVE_LITTLE_ENDIAN=0)) -DuECC_VLI_NATIVE_LITTLE_ENDIAN=0))
(libraries (bigstring)))) (libraries bigstring))

32
vendors/ocaml-uecc/test/dune vendored
View File

@ -1,26 +1,22 @@
(jbuild_version 1) (executable
(name test)
(modules Test)
(libraries alcotest uecc))
(executable (executable
((name test) (name test_vectors)
(modules (Test)) (modules Vectors Test_vectors)
(libraries (alcotest uecc)))) (libraries cstruct hex alcotest uecc))
(executable
((name test_vectors)
(modules (Vectors Test_vectors))
(libraries (cstruct hex alcotest uecc))))
(alias (alias
((name runtest-uecc) (name runtest-uecc)
(deps (test.exe)) (action (run %{exe:test.exe})))
(action (run ${<}))))
(alias (alias
((name runtest-uecc-vectors) (name runtest-uecc-vectors)
(deps (test_vectors.exe)) (action (run %{exe:test_vectors.exe})))
(action (run ${<}))))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest-uecc) (deps (alias runtest-uecc)
(alias runtest-uecc-vectors))))) (alias runtest-uecc-vectors)))

1
vendors/ocplib-json-typed/dune vendored
View File

@ -1 +0,0 @@
(jbuild_version 1)

8
vendors/ocplib-json-typed/lib_json_typed/dune vendored
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(library (library
((name ocplib_json_typed) (name ocplib_json_typed)
(public_name ocplib-json-typed) (public_name ocplib-json-typed)
(flags (:standard -w -9)) (flags (:standard -w -9))
(synopsis "Reliable manipulation of JSON objects") (synopsis "Reliable manipulation of JSON objects")
(libraries (uri)) (libraries uri)
(wrapped false))) (wrapped false))

8
vendors/ocplib-json-typed/lib_json_typed_browser/dune vendored
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(library (library
((name ocplib_json_typed_browser) (name ocplib_json_typed_browser)
(public_name ocplib-json-typed-browser) (public_name ocplib-json-typed-browser)
(flags (:standard -w -9)) (flags (:standard -w -9))
(synopsis "Native browser representation of JSON documents") (synopsis "Native browser representation of JSON documents")
(libraries (ocplib-json-typed js_of_ocaml)) (libraries ocplib-json-typed js_of_ocaml)
(wrapped false))) (wrapped false))

8
vendors/ocplib-json-typed/lib_json_typed_bson/dune vendored
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(library (library
((name ocplib_json_typed_bson) (name ocplib_json_typed_bson)
(public_name ocplib-json-typed-bson) (public_name ocplib-json-typed-bson)
(flags (:standard -w -9)) (flags (:standard -w -9))
(synopsis "BSON representation of JSON documents") (synopsis "BSON representation of JSON documents")
(libraries (ocplib-json-typed ocplib-endian)) (libraries ocplib-json-typed ocplib-endian)
(wrapped false))) (wrapped false))

1
vendors/ocplib-resto/dune vendored
View File

@ -1 +0,0 @@
(jbuild_version 1)

8
vendors/ocplib-resto/lib_ezresto-directory/dune vendored
View File

@ -1,8 +1,6 @@
(jbuild_version 1)
(library (library
((name ezresto_directory) (name ezresto_directory)
(public_name ocplib-ezresto-directory) (public_name ocplib-ezresto-directory)
(libraries (ocplib-ezresto ocplib-resto-directory)) (libraries ocplib-ezresto ocplib-resto-directory)
(flags (:standard -safe-string)) (flags (:standard -safe-string))
(wrapped false))) (wrapped false))

14
vendors/ocplib-resto/lib_ezresto-directory/test/dune vendored
View File

@ -1,14 +1,12 @@
(jbuild_version 1)
(executable (executable
((name ezResto_test) (name ezResto_test)
(flags (:standard -safe-string)) (flags (:standard -safe-string))
(libraries (ocplib-ezresto-directory lwt.unix)))) (libraries ocplib-ezresto-directory lwt.unix))
(alias (alias
((name runtest_ezresto) (name runtest_ezresto)
(action (run ${path:ezResto_test.exe})))) (action (run %{exe:ezResto_test.exe})))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest_ezresto))))) (deps (alias runtest_ezresto)))

8
vendors/ocplib-resto/lib_ezresto/dune vendored
View File

@ -1,8 +1,6 @@
(jbuild_version 1)
(library (library
((name ezresto) (name ezresto)
(public_name ocplib-ezresto) (public_name ocplib-ezresto)
(libraries (ocplib-resto-json)) (libraries ocplib-resto-json)
(wrapped false) (wrapped false)
(flags (:standard -safe-string)))) (flags (:standard -safe-string)))

8
vendors/ocplib-resto/lib_resto-cohttp/dune vendored
View File

@ -1,7 +1,5 @@
(jbuild_version 1)
(library (library
((name resto_cohttp) (name resto_cohttp)
(public_name ocplib-resto-cohttp) (public_name ocplib-resto-cohttp)
(libraries (ocplib-resto-directory cohttp-lwt-unix)) (libraries ocplib-resto-directory cohttp-lwt-unix)
(flags (:standard -safe-string)))) (flags (:standard -safe-string)))

8
vendors/ocplib-resto/lib_resto-directory/dune vendored
View File

@ -1,9 +1,7 @@
(jbuild_version 1)
(library (library
((name resto_directory) (name resto_directory)
(public_name ocplib-resto-directory) (public_name ocplib-resto-directory)
(libraries (lwt ocplib-resto)) (libraries lwt ocplib-resto)
(flags (:standard -safe-string)) (flags (:standard -safe-string))
(wrapped false))) (wrapped false))

14
vendors/ocplib-resto/lib_resto-directory/test/dune vendored
View File

@ -1,14 +1,12 @@
(jbuild_version 1)
(executable (executable
((name resto_test) (name resto_test)
(flags (:standard -safe-string)) (flags (:standard -safe-string))
(libraries (ocplib-resto-directory ocplib-resto-json lwt.unix)))) (libraries ocplib-resto-directory ocplib-resto-json lwt.unix))
(alias (alias
((name runtest_resto) (name runtest_resto)
(action (run ${path:resto_test.exe})))) (action (run %{exe:resto_test.exe})))
(alias (alias
((name runtest) (name runtest)
(deps ((alias runtest_resto))))) (deps (alias runtest_resto)))

8
vendors/ocplib-resto/lib_resto-json/dune vendored
View File

@ -1,8 +1,6 @@
(jbuild_version 1)
(library (library
((name resto_json) (name resto_json)
(public_name ocplib-resto-json) (public_name ocplib-resto-json)
(libraries (ocplib-json-typed ocplib-json-typed-bson ocplib-resto)) (libraries ocplib-json-typed ocplib-json-typed-bson ocplib-resto)
(flags (:standard -safe-string)) (flags (:standard -safe-string))
(wrapped false))) (wrapped false))

8
vendors/ocplib-resto/lib_resto/dune vendored
View File

@ -1,8 +1,6 @@
(jbuild_version 1)
(library (library
((name resto) (name resto)
(public_name ocplib-resto) (public_name ocplib-resto)
(flags (-w -30 -safe-string)) (flags (-w -30 -safe-string))
(libraries (uri)) (libraries uri)
(wrapped false))) (wrapped false))