diff --git a/src/bin_client/dune b/src/bin_client/dune index c35f403e924e53ad79b9fb67d80d1c2a6c05cc63..9ab1908d3f0cdac57edcd832c29a6cf6c2c77202 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -2,153 +2,147 @@ ; the alternative dependency mechanism of dune to implement optional ; dependencies. -; build static executable with --profile static (env - (static (flags (:standard - -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) + (static + (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executables (names main_client main_admin) - (instrumentation (backend bisect_ppx)) (public_names tezos-client tezos-admin-client) (package tezos-client) - (libraries tezos-base - tezos-base.unix - tezos-rpc-http-client - tezos-shell-services - tezos-client-base - tezos-client-commands - tezos-mockup-commands - tezos-proxy - - (select void_for_linking-genesis from - (tezos-client-genesis -> void_for_linking-genesis.empty) - (-> void_for_linking-genesis.empty)) - (select void_for_linking-genesis-carthagenet from - (tezos-client-genesis-carthagenet -> void_for_linking-genesis-carthagenet.empty) - (-> void_for_linking-genesis-carthagenet.empty)) - - (select void_for_linking-000-Ps9mPmXa from - (tezos-client-000-Ps9mPmXa -> void_for_linking-000-Ps9mPmXa.empty) - (-> void_for_linking-000-Ps9mPmXa.empty)) - (select void_for_linking-001-PtCJ7pwo from - (tezos-client-001-PtCJ7pwo-commands.registration -> void_for_linking-001-PtCJ7pwo.empty) - (-> void_for_linking-001-PtCJ7pwo.empty)) - (select void_for_linking-002-PsYLVpVv from - (tezos-client-002-PsYLVpVv-commands.registration -> void_for_linking-002-PsYLVpVv.empty) - (-> void_for_linking-002-PsYLVpVv.empty)) - (select void_for_linking-003-PsddFKi3 from - (tezos-client-003-PsddFKi3-commands.registration -> void_for_linking-003-PsddFKi3.empty) - (-> void_for_linking-003-PsddFKi3.empty)) - (select void_for_linking-004-Pt24m4xi from - (tezos-client-004-Pt24m4xi-commands.registration -> void_for_linking-004-Pt24m4xi.empty) - (-> void_for_linking-004-Pt24m4xi.empty)) - (select void_for_linking-005-PsBabyM1 from - (tezos-client-005-PsBabyM1-commands.registration -> void_for_linking-005-PsBabyM1.empty) - (-> void_for_linking-005-PsBabyM1.empty)) - (select void_for_linking-006-PsCARTHA from - (tezos-client-006-PsCARTHA-commands.registration -> void_for_linking-006-PsCARTHA.empty) - (-> void_for_linking-006-PsCARTHA.empty)) - (select void_for_linking-007-PsDELPH1 from - (tezos-client-007-PsDELPH1-commands-registration -> void_for_linking-007-PsDELPH1.empty) - (-> void_for_linking-007-PsDELPH1.empty)) - (select void_for_linking-008-PtEdo2Zk from - (tezos-client-008-PtEdo2Zk-commands-registration -> void_for_linking-008-PtEdo2Zk.empty) - (-> void_for_linking-008-PtEdo2Zk.empty)) - (select void_for_linking-009-PsFLoren from - (tezos-client-009-PsFLoren-commands-registration -> void_for_linking-009-PsFLoren.empty) - (-> void_for_linking-009-PsFLoren.empty)) - (select void_for_linking-010-PtGRANAD from - (tezos-client-010-PtGRANAD-commands-registration -> void_for_linking-010-PtGRANAD.empty) - (-> void_for_linking-010-PtGRANAD.empty)) - (select void_for_linking-011-PtHangz2 from - (tezos-client-011-PtHangz2-commands-registration -> void_for_linking-011-PtHangz2.empty) - (-> void_for_linking-011-PtHangz2.empty)) - - (select void_for_linking-alpha from - (tezos-client-alpha-commands-registration -> void_for_linking-alpha.empty) - (-> void_for_linking-alpha.empty)) - (select void_for_linking-demo-counter from - (tezos-client-demo-counter -> void_for_linking-demo-counter.empty) - (-> void_for_linking-demo-counter.empty)) - - (select void_for_linking-baking-alpha from - (tezos-baking-alpha-commands.registration -> void_for_linking-baking-alpha.empty) - (-> void_for_linking-baking-alpha.empty)) - (select void_for_linking-baking-010-PtGRANAD from - (tezos-baking-010-PtGRANAD-commands.registration -> void_for_linking-baking-010-PtGRANAD.empty) - (-> void_for_linking-baking-010-PtGRANAD.empty)) - (select void_for_linking-baking-011-PtHangz2 from - (tezos-baking-011-PtHangz2-commands.registration -> void_for_linking-baking-011-PtHangz2.empty) - (-> void_for_linking-baking-011-PtHangz2.empty)) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-base.unix + tezos-rpc-http-client + tezos-shell-services + tezos-client-base + tezos-client-commands + tezos-mockup-commands + tezos-proxy + tezos-stdlib-unix + tezos-client-base-unix + tezos-signer-backends.unix + (select void_for_linking-tezos-client-genesis from + (tezos-client-genesis -> void_for_linking-tezos-client-genesis.empty) + (-> void_for_linking-tezos-client-genesis.empty)) + (select void_for_linking-tezos-client-genesis-carthagenet from + (tezos-client-genesis-carthagenet -> void_for_linking-tezos-client-genesis-carthagenet.empty) + (-> void_for_linking-tezos-client-genesis-carthagenet.empty)) + (select void_for_linking-tezos-client-demo-counter from + (tezos-client-demo-counter -> void_for_linking-tezos-client-demo-counter.empty) + (-> void_for_linking-tezos-client-demo-counter.empty)) + (select void_for_linking-tezos-client-000-Ps9mPmXa from + (tezos-client-000-Ps9mPmXa -> void_for_linking-tezos-client-000-Ps9mPmXa.empty) + (-> void_for_linking-tezos-client-000-Ps9mPmXa.empty)) + (select void_for_linking-tezos-client-001-PtCJ7pwo-commands-registration from + (tezos-client-001-PtCJ7pwo-commands.registration -> void_for_linking-tezos-client-001-PtCJ7pwo-commands-registration.empty) + (-> void_for_linking-tezos-client-001-PtCJ7pwo-commands-registration.empty)) + (select void_for_linking-tezos-client-002-PsYLVpVv-commands-registration from + (tezos-client-002-PsYLVpVv-commands.registration -> void_for_linking-tezos-client-002-PsYLVpVv-commands-registration.empty) + (-> void_for_linking-tezos-client-002-PsYLVpVv-commands-registration.empty)) + (select void_for_linking-tezos-client-003-PsddFKi3-commands-registration from + (tezos-client-003-PsddFKi3-commands.registration -> void_for_linking-tezos-client-003-PsddFKi3-commands-registration.empty) + (-> void_for_linking-tezos-client-003-PsddFKi3-commands-registration.empty)) + (select void_for_linking-tezos-client-004-Pt24m4xi-commands-registration from + (tezos-client-004-Pt24m4xi-commands.registration -> void_for_linking-tezos-client-004-Pt24m4xi-commands-registration.empty) + (-> void_for_linking-tezos-client-004-Pt24m4xi-commands-registration.empty)) + (select void_for_linking-tezos-client-005-PsBabyM1-commands-registration from + (tezos-client-005-PsBabyM1-commands.registration -> void_for_linking-tezos-client-005-PsBabyM1-commands-registration.empty) + (-> void_for_linking-tezos-client-005-PsBabyM1-commands-registration.empty)) + (select void_for_linking-tezos-client-006-PsCARTHA-commands-registration from + (tezos-client-006-PsCARTHA-commands.registration -> void_for_linking-tezos-client-006-PsCARTHA-commands-registration.empty) + (-> void_for_linking-tezos-client-006-PsCARTHA-commands-registration.empty)) + (select void_for_linking-tezos-client-007-PsDELPH1-commands-registration from + (tezos-client-007-PsDELPH1-commands-registration -> void_for_linking-tezos-client-007-PsDELPH1-commands-registration.empty) + (-> void_for_linking-tezos-client-007-PsDELPH1-commands-registration.empty)) + (select void_for_linking-tezos-client-008-PtEdo2Zk-commands-registration from + (tezos-client-008-PtEdo2Zk-commands-registration -> void_for_linking-tezos-client-008-PtEdo2Zk-commands-registration.empty) + (-> void_for_linking-tezos-client-008-PtEdo2Zk-commands-registration.empty)) + (select void_for_linking-tezos-client-009-PsFLoren-commands-registration from + (tezos-client-009-PsFLoren-commands-registration -> void_for_linking-tezos-client-009-PsFLoren-commands-registration.empty) + (-> void_for_linking-tezos-client-009-PsFLoren-commands-registration.empty)) + (select void_for_linking-tezos-client-010-PtGRANAD-commands-registration from + (tezos-client-010-PtGRANAD-commands-registration -> void_for_linking-tezos-client-010-PtGRANAD-commands-registration.empty) + (-> void_for_linking-tezos-client-010-PtGRANAD-commands-registration.empty)) + (select void_for_linking-tezos-client-011-PtHangz2-commands-registration from + (tezos-client-011-PtHangz2-commands-registration -> void_for_linking-tezos-client-011-PtHangz2-commands-registration.empty) + (-> void_for_linking-tezos-client-011-PtHangz2-commands-registration.empty)) + (select void_for_linking-tezos-client-alpha-commands-registration from + (tezos-client-alpha-commands-registration -> void_for_linking-tezos-client-alpha-commands-registration.empty) + (-> void_for_linking-tezos-client-alpha-commands-registration.empty)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; If you modify this file around here, modify src/bin_proxy_server/dune too! ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (select void_for_linking-007-PsDELPH1-protocol-plugin from - (tezos-protocol-plugin-007-PsDELPH1 -> void_for_linking-007-PsDELPH1-protocol-plugin.empty) - (-> void_for_linking-007-PsDELPH1-protocol-plugin.empty)) - (select void_for_linking-008-PtEdo2Zk-protocol-plugin from - (tezos-protocol-plugin-008-PtEdo2Zk -> void_for_linking-008-PtEdo2Zk-protocol-plugin.empty) - (-> void_for_linking-008-PtEdo2Zk-protocol-plugin.empty)) - (select void_for_linking-009-PsFLoren-protocol-plugin from - (tezos-protocol-plugin-009-PsFLoren -> void_for_linking-009-PsFLoren-protocol-plugin.empty) - (-> void_for_linking-009-PsFLoren-protocol-plugin.empty)) - (select void_for_linking-010-PtGRANAD-protocol-plugin from - (tezos-protocol-plugin-010-PtGRANAD -> void_for_linking-010-PtGRANAD-protocol-plugin.empty) - (-> void_for_linking-010-PtGRANAD-protocol-plugin.empty)) - (select void_for_linking-011-PtHangz2-protocol-plugin from - (tezos-protocol-plugin-011-PtHangz2 -> void_for_linking-011-PtHangz2-protocol-plugin.empty) - (-> void_for_linking-011-PtHangz2-protocol-plugin.empty)) - (select void_for_linking-alpha-protocol-plugin from - (tezos-protocol-plugin-alpha -> void_for_linking-alpha-protocol-plugin.empty) - (-> void_for_linking-alpha-protocol-plugin.empty)) - - tezos-stdlib-unix - tezos-client-base-unix - tezos-signer-backends.unix) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_rpc_http_client - -open Tezos_stdlib_unix - -open Tezos_shell_services - -open Tezos_client_base - -open Tezos_client_commands - -open Tezos_mockup_commands - -open Tezos_client_base_unix - -linkall))) + (select void_for_linking-tezos-baking-010-PtGRANAD-commands-registration from + (tezos-baking-010-PtGRANAD-commands.registration -> void_for_linking-tezos-baking-010-PtGRANAD-commands-registration.empty) + (-> void_for_linking-tezos-baking-010-PtGRANAD-commands-registration.empty)) + (select void_for_linking-tezos-baking-011-PtHangz2-commands-registration from + (tezos-baking-011-PtHangz2-commands.registration -> void_for_linking-tezos-baking-011-PtHangz2-commands-registration.empty) + (-> void_for_linking-tezos-baking-011-PtHangz2-commands-registration.empty)) + (select void_for_linking-tezos-baking-alpha-commands-registration from + (tezos-baking-alpha-commands.registration -> void_for_linking-tezos-baking-alpha-commands-registration.empty) + (-> void_for_linking-tezos-baking-alpha-commands-registration.empty)) + (select void_for_linking-tezos-protocol-plugin-007-PsDELPH1 from + (tezos-protocol-plugin-007-PsDELPH1 -> void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty) + (-> void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty)) + (select void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk from + (tezos-protocol-plugin-008-PtEdo2Zk -> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty) + (-> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty)) + (select void_for_linking-tezos-protocol-plugin-009-PsFLoren from + (tezos-protocol-plugin-009-PsFLoren -> void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty) + (-> void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty)) + (select void_for_linking-tezos-protocol-plugin-010-PtGRANAD from + (tezos-protocol-plugin-010-PtGRANAD -> void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty) + (-> void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty)) + (select void_for_linking-tezos-protocol-plugin-011-PtHangz2 from + (tezos-protocol-plugin-011-PtHangz2 -> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty) + (-> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty)) + (select void_for_linking-tezos-protocol-plugin-alpha from + (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty) + (-> void_for_linking-tezos-protocol-plugin-alpha.empty))) + (flags + (:standard + -linkall + -open Tezos_base__TzPervasives + -open Tezos_rpc_http_client + -open Tezos_stdlib_unix + -open Tezos_shell_services + -open Tezos_client_base + -open Tezos_client_commands + -open Tezos_mockup_commands + -open Tezos_client_base_unix))) (rule (action (progn - (write-file void_for_linking-genesis.empty "") - (write-file void_for_linking-genesis.empty "") - (write-file void_for_linking-genesis-carthagenet.empty "") - (write-file void_for_linking-000-Ps9mPmXa.empty "") - (write-file void_for_linking-001-PtCJ7pwo.empty "") - (write-file void_for_linking-002-PsYLVpVv.empty "") - (write-file void_for_linking-003-PsddFKi3.empty "") - (write-file void_for_linking-004-Pt24m4xi.empty "") - (write-file void_for_linking-005-PsBabyM1.empty "") - (write-file void_for_linking-006-PsCARTHA.empty "") - (write-file void_for_linking-007-PsDELPH1.empty "") - (write-file void_for_linking-008-PtEdo2Zk.empty "") - (write-file void_for_linking-009-PsFLoren.empty "") - (write-file void_for_linking-010-PtGRANAD.empty "") - (write-file void_for_linking-011-PtHangz2.empty "") - (write-file void_for_linking-alpha.empty "") - (write-file void_for_linking-demo-counter.empty "") - (write-file void_for_linking-baking-alpha.empty "") - (write-file void_for_linking-baking-010-PtGRANAD.empty "") - (write-file void_for_linking-baking-011-PtHangz2.empty "") - (write-file void_for_linking-007-PsDELPH1-protocol-plugin.empty "") - (write-file void_for_linking-008-PtEdo2Zk-protocol-plugin.empty "") - (write-file void_for_linking-009-PsFLoren-protocol-plugin.empty "") - (write-file void_for_linking-010-PtGRANAD-protocol-plugin.empty "") - (write-file void_for_linking-011-PtHangz2-protocol-plugin.empty "") - (write-file void_for_linking-alpha-protocol-plugin.empty "") -))) + (write-file void_for_linking-tezos-client-genesis.empty "") + (write-file void_for_linking-tezos-client-genesis-carthagenet.empty "") + (write-file void_for_linking-tezos-client-demo-counter.empty "") + (write-file void_for_linking-tezos-client-000-Ps9mPmXa.empty "") + (write-file void_for_linking-tezos-client-001-PtCJ7pwo-commands-registration.empty "") + (write-file void_for_linking-tezos-client-002-PsYLVpVv-commands-registration.empty "") + (write-file void_for_linking-tezos-client-003-PsddFKi3-commands-registration.empty "") + (write-file void_for_linking-tezos-client-004-Pt24m4xi-commands-registration.empty "") + (write-file void_for_linking-tezos-client-005-PsBabyM1-commands-registration.empty "") + (write-file void_for_linking-tezos-client-006-PsCARTHA-commands-registration.empty "") + (write-file void_for_linking-tezos-client-007-PsDELPH1-commands-registration.empty "") + (write-file void_for_linking-tezos-client-008-PtEdo2Zk-commands-registration.empty "") + (write-file void_for_linking-tezos-client-009-PsFLoren-commands-registration.empty "") + (write-file void_for_linking-tezos-client-010-PtGRANAD-commands-registration.empty "") + (write-file void_for_linking-tezos-client-011-PtHangz2-commands-registration.empty "") + (write-file void_for_linking-tezos-client-alpha-commands-registration.empty "") + (write-file void_for_linking-tezos-baking-010-PtGRANAD-commands-registration.empty "") + (write-file void_for_linking-tezos-baking-011-PtHangz2-commands-registration.empty "") + (write-file void_for_linking-tezos-baking-alpha-commands-registration.empty "") + (write-file void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty "") + (write-file void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty "") + (write-file void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty "") + (write-file void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty "") + (write-file void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty "") + (write-file void_for_linking-tezos-protocol-plugin-alpha.empty "")))) (install (package tezos-client) diff --git a/src/bin_client/tezos-client.opam b/src/bin_client/tezos-client.opam index 34833698809af11119eb1247083c4fbd8f494dd8..c29596237a318eda7bc7b33297eb29f93ec1741f 100644 --- a/src/bin_client/tezos-client.opam +++ b/src/bin_client/tezos-client.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" @@ -8,27 +8,21 @@ license: "MIT" depends: [ "dune" { >= "2.0" } "tezos-base" + "tezos-rpc-http-client" + "tezos-shell-services" "tezos-client-base" - + "tezos-client-commands" + "tezos-mockup-commands" + "tezos-proxy" + "tezos-stdlib-unix" + "tezos-client-base-unix" + "tezos-signer-backends" +] +depopts: [ "tezos-client-genesis" "tezos-client-genesis-carthagenet" - - "tezos-client-alpha" - "tezos-client-000-Ps9mPmXa" - "tezos-client-001-PtCJ7pwo" - "tezos-client-002-PsYLVpVv" - "tezos-client-003-PsddFKi3" - "tezos-client-004-Pt24m4xi" - "tezos-client-005-PsBabyM1" - "tezos-client-006-PsCARTHA" - "tezos-client-007-PsDELPH1" - "tezos-client-008-PtEdo2Zk" - "tezos-client-009-PsFLoren" - "tezos-client-010-PtGRANAD" - "tezos-client-011-PtHangz2" "tezos-client-demo-counter" - - "tezos-client-alpha-commands" + "tezos-client-000-Ps9mPmXa" "tezos-client-001-PtCJ7pwo-commands" "tezos-client-002-PsYLVpVv-commands" "tezos-client-003-PsddFKi3-commands" @@ -40,18 +34,16 @@ depends: [ "tezos-client-009-PsFLoren-commands-registration" "tezos-client-010-PtGRANAD-commands-registration" "tezos-client-011-PtHangz2-commands-registration" - - "tezos-baking-alpha-commands" + "tezos-client-alpha-commands-registration" "tezos-baking-010-PtGRANAD-commands" "tezos-baking-011-PtHangz2-commands" - - "tezos-client-base-unix" - "tezos-mockup-commands" - "tezos-proxy" - "tezos-signer-backends" - "tezos-node" { with-test } - "tezos-protocol-compiler" { with-test } - "tezos-protocol-alpha-parameters" { with-test } + "tezos-baking-alpha-commands" + "tezos-protocol-plugin-007-PsDELPH1" + "tezos-protocol-plugin-008-PtEdo2Zk" + "tezos-protocol-plugin-009-PsFLoren" + "tezos-protocol-plugin-010-PtGRANAD" + "tezos-protocol-plugin-011-PtHangz2" + "tezos-protocol-plugin-alpha" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/bin_codec/dune b/src/bin_codec/dune index ec68ea896d3a10e144d55b3a6ea3a4f80e80645a..421a68bb9d6069ff20b46a62e5ecc40d50f49918 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -1,65 +1,64 @@ -; build static executable with --profile static (env - (static (flags (:standard - -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) + (static + (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) -(executables - (names codec) - (instrumentation (backend bisect_ppx)) - (public_names tezos-codec) +(executable + (name codec) + (public_name tezos-codec) (package tezos-codec) - (libraries data-encoding - tezos-base - tezos-stdlib-unix - tezos-event-logging - tezos-client-base - tezos-client-base-unix - tezos-clic - tezos-signer-services - (select void_for_linking-alpha from - (tezos-client-alpha -> void_for_linking-alpha.empty) - (-> void_for_linking-alpha.empty)) - (select void_for_linking-005-PsBabyM1 from - (tezos-client-005-PsBabyM1 -> void_for_linking-005-PsBabyM1.empty) - (-> void_for_linking-005-PsBabyM1.empty)) - (select void_for_linking-006-PsCARTHA from - (tezos-client-006-PsCARTHA -> void_for_linking-006-PsCARTHA.empty) - (-> void_for_linking-006-PsCARTHA.empty)) - (select void_for_linking-007-PsDELPH1 from - (tezos-client-007-PsDELPH1 -> void_for_linking-007-PsDELPH1.empty) - (-> void_for_linking-007-PsDELPH1.empty)) - (select void_for_linking-008-PtEdo2Zk from - (tezos-client-008-PtEdo2Zk -> void_for_linking-008-PtEdo2Zk.empty) - (-> void_for_linking-008-PtEdo2Zk.empty)) - (select void_for_linking-009-PsFLoren from - (tezos-client-009-PsFLoren -> void_for_linking-009-PsFLoren.empty) - (-> void_for_linking-009-PsFLoren.empty)) - (select void_for_linking-010-PtGRANAD from - (tezos-client-010-PtGRANAD -> void_for_linking-010-PtGRANAD.empty) - (-> void_for_linking-010-PtGRANAD.empty)) - (select void_for_linking-011-PtHangz2 from - (tezos-client-011-PtHangz2 -> void_for_linking-011-PtHangz2.empty) - (-> void_for_linking-011-PtHangz2.empty)) - ) - (flags (:standard -open Data_encoding - -open Tezos_base__TzPervasives - -open Tezos_client_base_unix - -open Tezos_client_base - -open Tezos_clic - -open Tezos_stdlib_unix - -open Tezos_event_logging - -linkall))) + (instrumentation (backend bisect_ppx)) + (libraries + data-encoding + tezos-base + tezos-stdlib-unix + tezos-event-logging + tezos-client-base + tezos-client-base-unix + tezos-clic + tezos-signer-services + (select void_for_linking-tezos-client-005-PsBabyM1 from + (tezos-client-005-PsBabyM1 -> void_for_linking-tezos-client-005-PsBabyM1.empty) + (-> void_for_linking-tezos-client-005-PsBabyM1.empty)) + (select void_for_linking-tezos-client-006-PsCARTHA from + (tezos-client-006-PsCARTHA -> void_for_linking-tezos-client-006-PsCARTHA.empty) + (-> void_for_linking-tezos-client-006-PsCARTHA.empty)) + (select void_for_linking-tezos-client-007-PsDELPH1 from + (tezos-client-007-PsDELPH1 -> void_for_linking-tezos-client-007-PsDELPH1.empty) + (-> void_for_linking-tezos-client-007-PsDELPH1.empty)) + (select void_for_linking-tezos-client-008-PtEdo2Zk from + (tezos-client-008-PtEdo2Zk -> void_for_linking-tezos-client-008-PtEdo2Zk.empty) + (-> void_for_linking-tezos-client-008-PtEdo2Zk.empty)) + (select void_for_linking-tezos-client-009-PsFLoren from + (tezos-client-009-PsFLoren -> void_for_linking-tezos-client-009-PsFLoren.empty) + (-> void_for_linking-tezos-client-009-PsFLoren.empty)) + (select void_for_linking-tezos-client-010-PtGRANAD from + (tezos-client-010-PtGRANAD -> void_for_linking-tezos-client-010-PtGRANAD.empty) + (-> void_for_linking-tezos-client-010-PtGRANAD.empty)) + (select void_for_linking-tezos-client-011-PtHangz2 from + (tezos-client-011-PtHangz2 -> void_for_linking-tezos-client-011-PtHangz2.empty) + (-> void_for_linking-tezos-client-011-PtHangz2.empty)) + (select void_for_linking-tezos-client-alpha from + (tezos-client-alpha -> void_for_linking-tezos-client-alpha.empty) + (-> void_for_linking-tezos-client-alpha.empty))) + (flags + (:standard + -linkall + -open Data_encoding + -open Tezos_base__TzPervasives + -open Tezos_client_base_unix + -open Tezos_client_base + -open Tezos_clic + -open Tezos_stdlib_unix + -open Tezos_event_logging))) (rule (action (progn - (write-file void_for_linking-alpha.empty "") - (write-file void_for_linking-005-PsBabyM1.empty "") - (write-file void_for_linking-006-PsCARTHA.empty "") - (write-file void_for_linking-007-PsDELPH1.empty "") - (write-file void_for_linking-008-PtEdo2Zk.empty "") - (write-file void_for_linking-009-PsFLoren.empty "") - (write-file void_for_linking-010-PtGRANAD.empty "") - (write-file void_for_linking-011-PtHangz2.empty "") -))) + (write-file void_for_linking-tezos-client-005-PsBabyM1.empty "") + (write-file void_for_linking-tezos-client-006-PsCARTHA.empty "") + (write-file void_for_linking-tezos-client-007-PsDELPH1.empty "") + (write-file void_for_linking-tezos-client-008-PtEdo2Zk.empty "") + (write-file void_for_linking-tezos-client-009-PsFLoren.empty "") + (write-file void_for_linking-tezos-client-010-PtGRANAD.empty "") + (write-file void_for_linking-tezos-client-011-PtHangz2.empty "") + (write-file void_for_linking-tezos-client-alpha.empty "")))) diff --git a/src/bin_codec/tezos-codec.opam b/src/bin_codec/tezos-codec.opam index 641080322507a72941e8aa0b6de0a55a824eafd5..25b04b2281615d0cebc73d8f6fec0da0006676b3 100644 --- a/src/bin_codec/tezos-codec.opam +++ b/src/bin_codec/tezos-codec.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" @@ -15,7 +15,6 @@ depends: [ "tezos-client-base-unix" "tezos-clic" "tezos-signer-services" - "tezos-client-alpha" ] depopts: [ "tezos-client-005-PsBabyM1" @@ -25,6 +24,7 @@ depopts: [ "tezos-client-009-PsFLoren" "tezos-client-010-PtGRANAD" "tezos-client-011-PtHangz2" + "tezos-client-alpha" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/bin_node/dune b/src/bin_node/dune index c97e5e561ca6f3cb94bbf2b18bca5c9b947a66c9..5b47a2a825ec17c568584c3c7850bf5a675bac6b 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -7,150 +7,154 @@ ; and copy always the same (generated itself) empty file ; "void_for_linking". -; build static executable with --profile static -(env - (static (flags (:standard -ccopt -static )))) +(env (static (flags (:standard -ccopt -static)))) (executable (name main) - (instrumentation (backend bisect_ppx)) (public_name tezos-node) (package tezos-node) - (libraries tezos-base - tezos-base.unix - tezos-version - tezos-stdlib-unix - tezos-shell-services - tezos-workers - tezos-rpc-http-server - tezos-p2p - tezos-shell - tezos-store - tezos-context - tezos-validator - tezos-shell-context - tezos-protocol-updater - (select void_for_linking-embedded-protocol-genesis from - (tezos-embedded-protocol-genesis -> void_for_linking-embedded-protocol-genesis.empty) - (-> void_for_linking-embedded-protocol-genesis.empty)) - (select void_for_linking-embedded-protocol-genesis-carthagenet from - (tezos-embedded-protocol-genesis-carthagenet -> void_for_linking-embedded-protocol-genesis-carthagenet.empty) - (-> void_for_linking-embedded-protocol-genesis-carthagenet.empty)) - (select void_for_linking-demo-noops from - (tezos-embedded-protocol-demo-noops -> void_for_linking-demo-noops.empty) - (-> void_for_linking-demo-noops.empty)) - (select void_for_linking-demo-counter from - (tezos-embedded-protocol-demo-counter -> void_for_linking-demo-counter.empty) - (-> void_for_linking-demo-counter.empty)) - (select void_for_linking-alpha from - (tezos-embedded-protocol-alpha -> void_for_linking-alpha.empty) - (-> void_for_linking-alpha.empty)) - (select void_for_linking-000-Ps9mPmXa from - (tezos-embedded-protocol-000-Ps9mPmXa -> void_for_linking-000-Ps9mPmXa.empty) - (-> void_for_linking-000-Ps9mPmXa.empty)) - (select void_for_linking-001-PtCJ7pwo from - (tezos-embedded-protocol-001-PtCJ7pwo -> void_for_linking-001-PtCJ7pwo.empty) - (-> void_for_linking-001-PtCJ7pwo.empty)) - (select void_for_linking-002-PsYLVpVv from - (tezos-embedded-protocol-002-PsYLVpVv -> void_for_linking-002-PsYLVpVv.empty) - (-> void_for_linking-002-PsYLVpVv.empty)) - (select void_for_linking-003-PsddFKi3 from - (tezos-embedded-protocol-003-PsddFKi3 -> void_for_linking-003-PsddFKi3.empty) - (-> void_for_linking-003-PsddFKi3.empty)) - (select void_for_linking-004-Pt24m4xi from - (tezos-embedded-protocol-004-Pt24m4xi -> void_for_linking-004-Pt24m4xi.empty) - (-> void_for_linking-004-Pt24m4xi.empty)) - (select void_for_linking-005-PsBABY5H from - (tezos-embedded-protocol-005-PsBABY5H -> void_for_linking-005-PsBABY5H.empty) - (-> void_for_linking-005-PsBABY5H.empty)) - (select void_for_linking-005-PsBabyM1 from - (tezos-embedded-protocol-005-PsBabyM1 -> void_for_linking-005-PsBabyM1.empty) - (-> void_for_linking-005-PsBabyM1.empty)) - (select void_for_linking-006-PsCARTHA from - (tezos-embedded-protocol-006-PsCARTHA -> void_for_linking-006-PsCARTHA.empty) - (-> void_for_linking-006-PsCARTHA.empty)) - (select void_for_linking-007-PsDELPH1 from - (tezos-embedded-protocol-007-PsDELPH1 -> void_for_linking-007-PsDELPH1.empty) - (-> void_for_linking-007-PsDELPH1.empty)) - (select void_for_linking-008-PtEdoTez from - (tezos-embedded-protocol-008-PtEdoTez -> void_for_linking-008-PtEdoTez.empty) - (-> void_for_linking-008-PtEdoTez.empty)) - (select void_for_linking-008-PtEdo2Zk from - (tezos-embedded-protocol-008-PtEdo2Zk -> void_for_linking-008-PtEdo2Zk.empty) - (-> void_for_linking-008-PtEdo2Zk.empty)) - (select void_for_linking-009-PsFLoren from - (tezos-embedded-protocol-009-PsFLoren -> void_for_linking-009-PsFLoren.empty) - (-> void_for_linking-009-PsFLoren.empty)) - (select void_for_linking-010-PtGRANAD from - (tezos-embedded-protocol-010-PtGRANAD -> void_for_linking-010-PtGRANAD.empty) - (-> void_for_linking-010-PtGRANAD.empty)) - (select void_for_linking-011-PtHangz2 from - (tezos-embedded-protocol-011-PtHangz2 -> void_for_linking-011-PtHangz2.empty) - (-> void_for_linking-011-PtHangz2.empty)) - (select void_for_linking-008-PtEdo2Zk-protocol-plugin-registerer from - (tezos-protocol-plugin-008-PtEdo2Zk-registerer -> void_for_linking-008-PtEdo2Zk-protocol-plugin-registerer.empty) - (-> void_for_linking-008-PtEdo2Zk-protocol-plugin-registerer.empty)) - (select void_for_linking-009-PsFLoren-protocol-plugin-registerer from - (tezos-protocol-plugin-009-PsFLoren-registerer -> void_for_linking-009-PsFLoren-protocol-plugin-registerer.empty) - (-> void_for_linking-009-PsFLoren-protocol-plugin-registerer.empty)) - (select void_for_linking-010-PtGRANAD-protocol-plugin-registerer from - (tezos-protocol-plugin-010-PtGRANAD-registerer -> void_for_linking-010-PtGRANAD-protocol-plugin-registerer.empty) - (-> void_for_linking-010-PtGRANAD-protocol-plugin-registerer.empty)) - (select void_for_linking-011-PtHangz2-protocol-plugin-registerer from - (tezos-protocol-plugin-011-PtHangz2-registerer -> void_for_linking-011-PtHangz2-protocol-plugin-registerer.empty) - (-> void_for_linking-011-PtHangz2-protocol-plugin-registerer.empty)) - (select void_for_linking-alpha-protocol-plugin-registerer from - (tezos-protocol-plugin-alpha-registerer -> void_for_linking-alpha-protocol-plugin-registerer.empty) - (-> void_for_linking-alpha-protocol-plugin-registerer.empty)) - cmdliner - fmt.cli - fmt.tty - tls - lwt-exit) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_base - -open Tezos_stdlib_unix - -open Tezos_shell_services - -open Tezos_rpc_http - -open Tezos_rpc_http_server - -open Tezos_p2p - -open Tezos_shell - -open Tezos_store - -open Tezos_context - -open Tezos_validator - -open Tezos_shell_context - -open Tezos_workers - -open Tezos_protocol_updater - -linkall))) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-base.unix + tezos-version + tezos-stdlib-unix + tezos-shell-services + tezos-workers + tezos-rpc-http-server + tezos-p2p + tezos-shell + tezos-store + tezos-context + tezos-validator + tezos-shell-context + tezos-protocol-updater + cmdliner + fmt.cli + fmt.tty + tls + lwt-exit + (select void_for_linking-tezos-embedded-protocol-genesis from + (tezos-embedded-protocol-genesis -> void_for_linking-tezos-embedded-protocol-genesis.empty) + (-> void_for_linking-tezos-embedded-protocol-genesis.empty)) + (select void_for_linking-tezos-embedded-protocol-genesis-carthagenet from + (tezos-embedded-protocol-genesis-carthagenet -> void_for_linking-tezos-embedded-protocol-genesis-carthagenet.empty) + (-> void_for_linking-tezos-embedded-protocol-genesis-carthagenet.empty)) + (select void_for_linking-tezos-embedded-protocol-demo-noops from + (tezos-embedded-protocol-demo-noops -> void_for_linking-tezos-embedded-protocol-demo-noops.empty) + (-> void_for_linking-tezos-embedded-protocol-demo-noops.empty)) + (select void_for_linking-tezos-embedded-protocol-demo-counter from + (tezos-embedded-protocol-demo-counter -> void_for_linking-tezos-embedded-protocol-demo-counter.empty) + (-> void_for_linking-tezos-embedded-protocol-demo-counter.empty)) + (select void_for_linking-tezos-embedded-protocol-000-Ps9mPmXa from + (tezos-embedded-protocol-000-Ps9mPmXa -> void_for_linking-tezos-embedded-protocol-000-Ps9mPmXa.empty) + (-> void_for_linking-tezos-embedded-protocol-000-Ps9mPmXa.empty)) + (select void_for_linking-tezos-embedded-protocol-001-PtCJ7pwo from + (tezos-embedded-protocol-001-PtCJ7pwo -> void_for_linking-tezos-embedded-protocol-001-PtCJ7pwo.empty) + (-> void_for_linking-tezos-embedded-protocol-001-PtCJ7pwo.empty)) + (select void_for_linking-tezos-embedded-protocol-002-PsYLVpVv from + (tezos-embedded-protocol-002-PsYLVpVv -> void_for_linking-tezos-embedded-protocol-002-PsYLVpVv.empty) + (-> void_for_linking-tezos-embedded-protocol-002-PsYLVpVv.empty)) + (select void_for_linking-tezos-embedded-protocol-003-PsddFKi3 from + (tezos-embedded-protocol-003-PsddFKi3 -> void_for_linking-tezos-embedded-protocol-003-PsddFKi3.empty) + (-> void_for_linking-tezos-embedded-protocol-003-PsddFKi3.empty)) + (select void_for_linking-tezos-embedded-protocol-004-Pt24m4xi from + (tezos-embedded-protocol-004-Pt24m4xi -> void_for_linking-tezos-embedded-protocol-004-Pt24m4xi.empty) + (-> void_for_linking-tezos-embedded-protocol-004-Pt24m4xi.empty)) + (select void_for_linking-tezos-embedded-protocol-005-PsBABY5H from + (tezos-embedded-protocol-005-PsBABY5H -> void_for_linking-tezos-embedded-protocol-005-PsBABY5H.empty) + (-> void_for_linking-tezos-embedded-protocol-005-PsBABY5H.empty)) + (select void_for_linking-tezos-embedded-protocol-005-PsBabyM1 from + (tezos-embedded-protocol-005-PsBabyM1 -> void_for_linking-tezos-embedded-protocol-005-PsBabyM1.empty) + (-> void_for_linking-tezos-embedded-protocol-005-PsBabyM1.empty)) + (select void_for_linking-tezos-embedded-protocol-006-PsCARTHA from + (tezos-embedded-protocol-006-PsCARTHA -> void_for_linking-tezos-embedded-protocol-006-PsCARTHA.empty) + (-> void_for_linking-tezos-embedded-protocol-006-PsCARTHA.empty)) + (select void_for_linking-tezos-embedded-protocol-007-PsDELPH1 from + (tezos-embedded-protocol-007-PsDELPH1 -> void_for_linking-tezos-embedded-protocol-007-PsDELPH1.empty) + (-> void_for_linking-tezos-embedded-protocol-007-PsDELPH1.empty)) + (select void_for_linking-tezos-embedded-protocol-008-PtEdoTez from + (tezos-embedded-protocol-008-PtEdoTez -> void_for_linking-tezos-embedded-protocol-008-PtEdoTez.empty) + (-> void_for_linking-tezos-embedded-protocol-008-PtEdoTez.empty)) + (select void_for_linking-tezos-embedded-protocol-008-PtEdo2Zk from + (tezos-embedded-protocol-008-PtEdo2Zk -> void_for_linking-tezos-embedded-protocol-008-PtEdo2Zk.empty) + (-> void_for_linking-tezos-embedded-protocol-008-PtEdo2Zk.empty)) + (select void_for_linking-tezos-embedded-protocol-009-PsFLoren from + (tezos-embedded-protocol-009-PsFLoren -> void_for_linking-tezos-embedded-protocol-009-PsFLoren.empty) + (-> void_for_linking-tezos-embedded-protocol-009-PsFLoren.empty)) + (select void_for_linking-tezos-embedded-protocol-010-PtGRANAD from + (tezos-embedded-protocol-010-PtGRANAD -> void_for_linking-tezos-embedded-protocol-010-PtGRANAD.empty) + (-> void_for_linking-tezos-embedded-protocol-010-PtGRANAD.empty)) + (select void_for_linking-tezos-embedded-protocol-011-PtHangz2 from + (tezos-embedded-protocol-011-PtHangz2 -> void_for_linking-tezos-embedded-protocol-011-PtHangz2.empty) + (-> void_for_linking-tezos-embedded-protocol-011-PtHangz2.empty)) + (select void_for_linking-tezos-embedded-protocol-alpha from + (tezos-embedded-protocol-alpha -> void_for_linking-tezos-embedded-protocol-alpha.empty) + (-> void_for_linking-tezos-embedded-protocol-alpha.empty)) + (select void_for_linking-tezos-protocol-plugin-007-PsDELPH1-registerer from + (tezos-protocol-plugin-007-PsDELPH1-registerer -> void_for_linking-tezos-protocol-plugin-007-PsDELPH1-registerer.empty) + (-> void_for_linking-tezos-protocol-plugin-007-PsDELPH1-registerer.empty)) + (select void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk-registerer from + (tezos-protocol-plugin-008-PtEdo2Zk-registerer -> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk-registerer.empty) + (-> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk-registerer.empty)) + (select void_for_linking-tezos-protocol-plugin-009-PsFLoren-registerer from + (tezos-protocol-plugin-009-PsFLoren-registerer -> void_for_linking-tezos-protocol-plugin-009-PsFLoren-registerer.empty) + (-> void_for_linking-tezos-protocol-plugin-009-PsFLoren-registerer.empty)) + (select void_for_linking-tezos-protocol-plugin-010-PtGRANAD-registerer from + (tezos-protocol-plugin-010-PtGRANAD-registerer -> void_for_linking-tezos-protocol-plugin-010-PtGRANAD-registerer.empty) + (-> void_for_linking-tezos-protocol-plugin-010-PtGRANAD-registerer.empty)) + (select void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer from + (tezos-protocol-plugin-011-PtHangz2-registerer -> void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer.empty) + (-> void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer.empty)) + (select void_for_linking-tezos-protocol-plugin-alpha-registerer from + (tezos-protocol-plugin-alpha-registerer -> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty) + (-> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty))) + (flags + (:standard + -linkall + -open Tezos_base__TzPervasives + -open Tezos_base + -open Tezos_stdlib_unix + -open Tezos_shell_services + -open Tezos_rpc_http + -open Tezos_rpc_http_server + -open Tezos_p2p + -open Tezos_shell + -open Tezos_store + -open Tezos_context + -open Tezos_validator + -open Tezos_shell_context + -open Tezos_workers + -open Tezos_protocol_updater))) (rule (action (progn - (write-file void_for_linking-embedded-protocol-genesis.empty "") - (write-file void_for_linking-embedded-protocol-genesis-carthagenet.empty "") - (write-file void_for_linking-demo-noops.empty "") - (write-file void_for_linking-demo-counter.empty "") - (write-file void_for_linking-alpha.empty "") - (write-file void_for_linking-000-Ps9mPmXa.empty "") - (write-file void_for_linking-001-PtCJ7pwo.empty "") - (write-file void_for_linking-002-PsYLVpVv.empty "") - (write-file void_for_linking-003-PsddFKi3.empty "") - (write-file void_for_linking-004-Pt24m4xi.empty "") - (write-file void_for_linking-005-PsBABY5H.empty "") - (write-file void_for_linking-005-PsBabyM1.empty "") - (write-file void_for_linking-006-PsCARTHA.empty "") - (write-file void_for_linking-007-PsDELPH1.empty "") - (write-file void_for_linking-008-PtEdoTez.empty "") - (write-file void_for_linking-008-PtEdo2Zk.empty "") - (write-file void_for_linking-009-PsFLoren.empty "") - (write-file void_for_linking-010-PtGRANAD.empty "") - (write-file void_for_linking-011-PtHangz2.empty "") - (write-file void_for_linking-alpha-protocol-plugin-registerer.empty "") - (write-file void_for_linking-008-PtEdo2Zk-protocol-plugin-registerer.empty "") - (write-file void_for_linking-009-PsFLoren-protocol-plugin-registerer.empty "") - (write-file void_for_linking-010-PtGRANAD-protocol-plugin-registerer.empty "") - (write-file void_for_linking-011-PtHangz2-protocol-plugin-registerer.empty "") -))) + (write-file void_for_linking-tezos-embedded-protocol-genesis.empty "") + (write-file void_for_linking-tezos-embedded-protocol-genesis-carthagenet.empty "") + (write-file void_for_linking-tezos-embedded-protocol-demo-noops.empty "") + (write-file void_for_linking-tezos-embedded-protocol-demo-counter.empty "") + (write-file void_for_linking-tezos-embedded-protocol-000-Ps9mPmXa.empty "") + (write-file void_for_linking-tezos-embedded-protocol-001-PtCJ7pwo.empty "") + (write-file void_for_linking-tezos-embedded-protocol-002-PsYLVpVv.empty "") + (write-file void_for_linking-tezos-embedded-protocol-003-PsddFKi3.empty "") + (write-file void_for_linking-tezos-embedded-protocol-004-Pt24m4xi.empty "") + (write-file void_for_linking-tezos-embedded-protocol-005-PsBABY5H.empty "") + (write-file void_for_linking-tezos-embedded-protocol-005-PsBabyM1.empty "") + (write-file void_for_linking-tezos-embedded-protocol-006-PsCARTHA.empty "") + (write-file void_for_linking-tezos-embedded-protocol-007-PsDELPH1.empty "") + (write-file void_for_linking-tezos-embedded-protocol-008-PtEdoTez.empty "") + (write-file void_for_linking-tezos-embedded-protocol-008-PtEdo2Zk.empty "") + (write-file void_for_linking-tezos-embedded-protocol-009-PsFLoren.empty "") + (write-file void_for_linking-tezos-embedded-protocol-010-PtGRANAD.empty "") + (write-file void_for_linking-tezos-embedded-protocol-011-PtHangz2.empty "") + (write-file void_for_linking-tezos-embedded-protocol-alpha.empty "") + (write-file void_for_linking-tezos-protocol-plugin-007-PsDELPH1-registerer.empty "") + (write-file void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk-registerer.empty "") + (write-file void_for_linking-tezos-protocol-plugin-009-PsFLoren-registerer.empty "") + (write-file void_for_linking-tezos-protocol-plugin-010-PtGRANAD-registerer.empty "") + (write-file void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer.empty "") + (write-file void_for_linking-tezos-protocol-plugin-alpha-registerer.empty "")))) (install (package tezos-node) diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam index f06bab09fe6fd2133b510dbd42e298eabf72e0eb..6b70cc9fb02de6c29828dd2f4ea402b8e22cad46 100644 --- a/src/bin_node/tezos-node.opam +++ b/src/bin_node/tezos-node.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" @@ -9,18 +9,27 @@ depends: [ "dune" { >= "2.0" } "tezos-base" "tezos-version" + "tezos-stdlib-unix" + "tezos-shell-services" + "tezos-workers" "tezos-rpc-http-server" "tezos-p2p" "tezos-shell" - "tezos-workers" - "tezos-protocol-updater" + "tezos-store" + "tezos-context" "tezos-validator" + "tezos-shell-context" + "tezos-protocol-updater" + "cmdliner" + "fmt" + "tls" { >= "0.10" } + "lwt-exit" +] +depopts: [ "tezos-embedded-protocol-genesis" "tezos-embedded-protocol-genesis-carthagenet" "tezos-embedded-protocol-demo-noops" "tezos-embedded-protocol-demo-counter" - "tezos-embedded-protocol-alpha" - "tezos-embedded-protocol-demo-noops" "tezos-embedded-protocol-000-Ps9mPmXa" "tezos-embedded-protocol-001-PtCJ7pwo" "tezos-embedded-protocol-002-PsYLVpVv" @@ -30,20 +39,18 @@ depends: [ "tezos-embedded-protocol-005-PsBabyM1" "tezos-embedded-protocol-006-PsCARTHA" "tezos-embedded-protocol-007-PsDELPH1" + "tezos-embedded-protocol-008-PtEdoTez" "tezos-embedded-protocol-008-PtEdo2Zk" "tezos-embedded-protocol-009-PsFLoren" "tezos-embedded-protocol-010-PtGRANAD" "tezos-embedded-protocol-011-PtHangz2" + "tezos-embedded-protocol-alpha" + "tezos-protocol-plugin-007-PsDELPH1-registerer" "tezos-protocol-plugin-008-PtEdo2Zk-registerer" "tezos-protocol-plugin-009-PsFLoren-registerer" "tezos-protocol-plugin-010-PtGRANAD-registerer" "tezos-protocol-plugin-011-PtHangz2-registerer" "tezos-protocol-plugin-alpha-registerer" - "cmdliner" - "fmt" - "lwt-exit" - "tls" { >= "0.10" } - "cstruct" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index 42265f6f2e328a020e038f6ed9c2f092978a2759..a5a0406e7dfbca00682f786f50dcc545cb146cd3 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -2,120 +2,119 @@ ; the alternative dependency mechanism of dune to implement optional ; dependencies. -(executables - (names main_proxy_server) - (instrumentation (backend bisect_ppx)) - (public_names tezos-proxy-server) - (package tezos-proxy-server) - (libraries tezos-base - tezos-base.unix - cmdliner - lwt-exit - tezos-proxy - tezos-proxy-server-config - tezos-rpc-http-client-unix - tezos-rpc-http-server - tezos-shell-services - tezos-version - - (select void_for_linking-genesis from - (tezos-client-genesis -> void_for_linking-genesis.empty) - (-> void_for_linking-genesis.empty)) - (select void_for_linking-genesis-carthagenet from - (tezos-client-genesis-carthagenet -> void_for_linking-genesis-carthagenet.empty) - (-> void_for_linking-genesis-carthagenet.empty)) - - (select void_for_linking-000-Ps9mPmXa from - (tezos-client-000-Ps9mPmXa -> void_for_linking-000-Ps9mPmXa.empty) - (-> void_for_linking-000-Ps9mPmXa.empty)) - (select void_for_linking-001-PtCJ7pwo from - (tezos-client-001-PtCJ7pwo -> void_for_linking-001-PtCJ7pwo.empty) - (-> void_for_linking-001-PtCJ7pwo.empty)) - (select void_for_linking-002-PsYLVpVv from - (tezos-client-002-PsYLVpVv -> void_for_linking-002-PsYLVpVv.empty) - (-> void_for_linking-002-PsYLVpVv.empty)) - (select void_for_linking-003-PsddFKi3 from - (tezos-client-003-PsddFKi3 -> void_for_linking-003-PsddFKi3.empty) - (-> void_for_linking-003-PsddFKi3.empty)) - (select void_for_linking-004-Pt24m4xi from - (tezos-client-004-Pt24m4xi -> void_for_linking-004-Pt24m4xi.empty) - (-> void_for_linking-004-Pt24m4xi.empty)) - (select void_for_linking-005-PsBabyM1 from - (tezos-client-005-PsBabyM1 -> void_for_linking-005-PsBabyM1.empty) - (-> void_for_linking-005-PsBabyM1.empty)) - (select void_for_linking-006-PsCARTHA from - (tezos-client-006-PsCARTHA -> void_for_linking-006-PsCARTHA.empty) - (-> void_for_linking-006-PsCARTHA.empty)) - (select void_for_linking-007-PsDELPH1 from - (tezos-client-007-PsDELPH1 -> void_for_linking-007-PsDELPH1.empty) - (-> void_for_linking-007-PsDELPH1.empty)) - (select void_for_linking-008-PtEdo2Zk from - (tezos-client-008-PtEdo2Zk -> void_for_linking-008-PtEdo2Zk.empty) - (-> void_for_linking-008-PtEdo2Zk.empty)) - (select void_for_linking-009-PsFLoren from - (tezos-client-009-PsFLoren -> void_for_linking-009-PsFLoren.empty) - (-> void_for_linking-009-PsFLoren.empty)) - (select void_for_linking-010-PtGRANAD from - (tezos-client-010-PtGRANAD -> void_for_linking-010-PtGRANAD.empty) - (-> void_for_linking-010-PtGRANAD.empty)) - (select void_for_linking-011-PtHangz2 from - (tezos-client-011-PtHangz2 -> void_for_linking-011-PtHangz2.empty) - (-> void_for_linking-011-PtHangz2.empty)) +(env (static (flags (:standard -ccopt -static)))) - (select void_for_linking-alpha from - (tezos-client-alpha -> void_for_linking-alpha.empty) - (-> void_for_linking-alpha.empty)) - (select void_for_linking-demo-counter from - (tezos-client-demo-counter -> void_for_linking-demo-counter.empty) - (-> void_for_linking-demo-counter.empty)) - - (select void_for_linking-007-PsDELPH1-protocol-plugin from - (tezos-protocol-plugin-007-PsDELPH1 -> void_for_linking-007-PsDELPH1-protocol-plugin.empty) - (-> void_for_linking-007-PsDELPH1-protocol-plugin.empty)) - (select void_for_linking-008-PtEdo2Zk-protocol-plugin from - (tezos-protocol-plugin-008-PtEdo2Zk -> void_for_linking-008-PtEdo2Zk-protocol-plugin.empty) - (-> void_for_linking-008-PtEdo2Zk-protocol-plugin.empty)) - (select void_for_linking-009-PsFLoren-protocol-plugin from - (tezos-protocol-plugin-009-PsFLoren -> void_for_linking-009-PsFLoren-protocol-plugin.empty) - (-> void_for_linking-009-PsFLoren-protocol-plugin.empty)) - (select void_for_linking-010-PtGRANAD-protocol-plugin from - (tezos-protocol-plugin-010-PtGRANAD -> void_for_linking-010-PtGRANAD-protocol-plugin.empty) - (-> void_for_linking-010-PtGRANAD-protocol-plugin.empty)) - (select void_for_linking-011-PtHangz2-protocol-plugin from - (tezos-protocol-plugin-011-PtHangz2 -> void_for_linking-011-PtHangz2-protocol-plugin.empty) - (-> void_for_linking-011-PtHangz2-protocol-plugin.empty)) - (select void_for_linking-alpha-protocol-plugin from - (tezos-protocol-plugin-alpha -> void_for_linking-alpha-protocol-plugin.empty) - (-> void_for_linking-alpha-protocol-plugin.empty))) - - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_base - -open Tezos_stdlib_unix - -linkall))) +(executable + (name main_proxy_server) + (public_name tezos-proxy-server) + (package tezos-proxy-server) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-base.unix + cmdliner + lwt-exit + tezos-proxy + tezos-proxy-server-config + tezos-rpc-http-client-unix + tezos-rpc-http-server + tezos-shell-services + tezos-version + (select void_for_linking-tezos-client-genesis from + (tezos-client-genesis -> void_for_linking-tezos-client-genesis.empty) + (-> void_for_linking-tezos-client-genesis.empty)) + (select void_for_linking-tezos-client-genesis-carthagenet from + (tezos-client-genesis-carthagenet -> void_for_linking-tezos-client-genesis-carthagenet.empty) + (-> void_for_linking-tezos-client-genesis-carthagenet.empty)) + (select void_for_linking-tezos-client-demo-counter from + (tezos-client-demo-counter -> void_for_linking-tezos-client-demo-counter.empty) + (-> void_for_linking-tezos-client-demo-counter.empty)) + (select void_for_linking-tezos-client-000-Ps9mPmXa from + (tezos-client-000-Ps9mPmXa -> void_for_linking-tezos-client-000-Ps9mPmXa.empty) + (-> void_for_linking-tezos-client-000-Ps9mPmXa.empty)) + (select void_for_linking-tezos-client-001-PtCJ7pwo from + (tezos-client-001-PtCJ7pwo -> void_for_linking-tezos-client-001-PtCJ7pwo.empty) + (-> void_for_linking-tezos-client-001-PtCJ7pwo.empty)) + (select void_for_linking-tezos-client-002-PsYLVpVv from + (tezos-client-002-PsYLVpVv -> void_for_linking-tezos-client-002-PsYLVpVv.empty) + (-> void_for_linking-tezos-client-002-PsYLVpVv.empty)) + (select void_for_linking-tezos-client-003-PsddFKi3 from + (tezos-client-003-PsddFKi3 -> void_for_linking-tezos-client-003-PsddFKi3.empty) + (-> void_for_linking-tezos-client-003-PsddFKi3.empty)) + (select void_for_linking-tezos-client-004-Pt24m4xi from + (tezos-client-004-Pt24m4xi -> void_for_linking-tezos-client-004-Pt24m4xi.empty) + (-> void_for_linking-tezos-client-004-Pt24m4xi.empty)) + (select void_for_linking-tezos-client-005-PsBabyM1 from + (tezos-client-005-PsBabyM1 -> void_for_linking-tezos-client-005-PsBabyM1.empty) + (-> void_for_linking-tezos-client-005-PsBabyM1.empty)) + (select void_for_linking-tezos-client-006-PsCARTHA from + (tezos-client-006-PsCARTHA -> void_for_linking-tezos-client-006-PsCARTHA.empty) + (-> void_for_linking-tezos-client-006-PsCARTHA.empty)) + (select void_for_linking-tezos-client-007-PsDELPH1 from + (tezos-client-007-PsDELPH1 -> void_for_linking-tezos-client-007-PsDELPH1.empty) + (-> void_for_linking-tezos-client-007-PsDELPH1.empty)) + (select void_for_linking-tezos-client-008-PtEdo2Zk from + (tezos-client-008-PtEdo2Zk -> void_for_linking-tezos-client-008-PtEdo2Zk.empty) + (-> void_for_linking-tezos-client-008-PtEdo2Zk.empty)) + (select void_for_linking-tezos-client-009-PsFLoren from + (tezos-client-009-PsFLoren -> void_for_linking-tezos-client-009-PsFLoren.empty) + (-> void_for_linking-tezos-client-009-PsFLoren.empty)) + (select void_for_linking-tezos-client-010-PtGRANAD from + (tezos-client-010-PtGRANAD -> void_for_linking-tezos-client-010-PtGRANAD.empty) + (-> void_for_linking-tezos-client-010-PtGRANAD.empty)) + (select void_for_linking-tezos-client-011-PtHangz2 from + (tezos-client-011-PtHangz2 -> void_for_linking-tezos-client-011-PtHangz2.empty) + (-> void_for_linking-tezos-client-011-PtHangz2.empty)) + (select void_for_linking-tezos-client-alpha from + (tezos-client-alpha -> void_for_linking-tezos-client-alpha.empty) + (-> void_for_linking-tezos-client-alpha.empty)) + (select void_for_linking-tezos-protocol-plugin-007-PsDELPH1 from + (tezos-protocol-plugin-007-PsDELPH1 -> void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty) + (-> void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty)) + (select void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk from + (tezos-protocol-plugin-008-PtEdo2Zk -> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty) + (-> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty)) + (select void_for_linking-tezos-protocol-plugin-009-PsFLoren from + (tezos-protocol-plugin-009-PsFLoren -> void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty) + (-> void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty)) + (select void_for_linking-tezos-protocol-plugin-010-PtGRANAD from + (tezos-protocol-plugin-010-PtGRANAD -> void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty) + (-> void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty)) + (select void_for_linking-tezos-protocol-plugin-011-PtHangz2 from + (tezos-protocol-plugin-011-PtHangz2 -> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty) + (-> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty)) + (select void_for_linking-tezos-protocol-plugin-alpha from + (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty) + (-> void_for_linking-tezos-protocol-plugin-alpha.empty))) + (flags + (:standard + -linkall + -open Tezos_base__TzPervasives + -open Tezos_base + -open Tezos_stdlib_unix))) (rule (action (progn - (write-file void_for_linking-genesis.empty "") - (write-file void_for_linking-genesis-carthagenet.empty "") - (write-file void_for_linking-000-Ps9mPmXa.empty "") - (write-file void_for_linking-001-PtCJ7pwo.empty "") - (write-file void_for_linking-002-PsYLVpVv.empty "") - (write-file void_for_linking-003-PsddFKi3.empty "") - (write-file void_for_linking-004-Pt24m4xi.empty "") - (write-file void_for_linking-005-PsBabyM1.empty "") - (write-file void_for_linking-006-PsCARTHA.empty "") - (write-file void_for_linking-007-PsDELPH1.empty "") - (write-file void_for_linking-008-PtEdo2Zk.empty "") - (write-file void_for_linking-009-PsFLoren.empty "") - (write-file void_for_linking-010-PtGRANAD.empty "") - (write-file void_for_linking-011-PtHangz2.empty "") - (write-file void_for_linking-alpha.empty "") - (write-file void_for_linking-demo-counter.empty "") - (write-file void_for_linking-007-PsDELPH1-protocol-plugin.empty "") - (write-file void_for_linking-008-PtEdo2Zk-protocol-plugin.empty "") - (write-file void_for_linking-009-PsFLoren-protocol-plugin.empty "") - (write-file void_for_linking-010-PtGRANAD-protocol-plugin.empty "") - (write-file void_for_linking-011-PtHangz2-protocol-plugin.empty "") - (write-file void_for_linking-alpha-protocol-plugin.empty "") -))) + (write-file void_for_linking-tezos-client-genesis.empty "") + (write-file void_for_linking-tezos-client-genesis-carthagenet.empty "") + (write-file void_for_linking-tezos-client-demo-counter.empty "") + (write-file void_for_linking-tezos-client-000-Ps9mPmXa.empty "") + (write-file void_for_linking-tezos-client-001-PtCJ7pwo.empty "") + (write-file void_for_linking-tezos-client-002-PsYLVpVv.empty "") + (write-file void_for_linking-tezos-client-003-PsddFKi3.empty "") + (write-file void_for_linking-tezos-client-004-Pt24m4xi.empty "") + (write-file void_for_linking-tezos-client-005-PsBabyM1.empty "") + (write-file void_for_linking-tezos-client-006-PsCARTHA.empty "") + (write-file void_for_linking-tezos-client-007-PsDELPH1.empty "") + (write-file void_for_linking-tezos-client-008-PtEdo2Zk.empty "") + (write-file void_for_linking-tezos-client-009-PsFLoren.empty "") + (write-file void_for_linking-tezos-client-010-PtGRANAD.empty "") + (write-file void_for_linking-tezos-client-011-PtHangz2.empty "") + (write-file void_for_linking-tezos-client-alpha.empty "") + (write-file void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty "") + (write-file void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty "") + (write-file void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty "") + (write-file void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty "") + (write-file void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty "") + (write-file void_for_linking-tezos-protocol-plugin-alpha.empty "")))) diff --git a/src/bin_proxy_server/tezos-proxy-server.opam b/src/bin_proxy_server/tezos-proxy-server.opam index 1ae2004a4ac7efafc04208fe57022f84360e8b87..d72bd2e0b0c28b5c9d8f95efbd3842036890d72b 100644 --- a/src/bin_proxy_server/tezos-proxy-server.opam +++ b/src/bin_proxy_server/tezos-proxy-server.opam @@ -1,22 +1,46 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "tezos-tooling" "dune" { >= "2.0" } + "tezos-base" "cmdliner" "lwt-exit" - "tezos-base" "tezos-proxy" "tezos-proxy-server-config" "tezos-rpc-http-client-unix" "tezos-rpc-http-server" + "tezos-shell-services" "tezos-version" ] +depopts: [ + "tezos-client-genesis" + "tezos-client-genesis-carthagenet" + "tezos-client-demo-counter" + "tezos-client-000-Ps9mPmXa" + "tezos-client-001-PtCJ7pwo" + "tezos-client-002-PsYLVpVv" + "tezos-client-003-PsddFKi3" + "tezos-client-004-Pt24m4xi" + "tezos-client-005-PsBabyM1" + "tezos-client-006-PsCARTHA" + "tezos-client-007-PsDELPH1" + "tezos-client-008-PtEdo2Zk" + "tezos-client-009-PsFLoren" + "tezos-client-010-PtGRANAD" + "tezos-client-011-PtHangz2" + "tezos-client-alpha" + "tezos-protocol-plugin-007-PsDELPH1" + "tezos-protocol-plugin-008-PtEdo2Zk" + "tezos-protocol-plugin-009-PsFLoren" + "tezos-protocol-plugin-010-PtGRANAD" + "tezos-protocol-plugin-011-PtHangz2" + "tezos-protocol-plugin-alpha" +] build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test}