Verified Commit 616a3429 authored by Eugen Zalinescu's avatar Eugen Zalinescu Committed by Mehdi Bouaziz

Build: store protocol parameters in proto_XXX/parameters folder

parent 80b40d91
......@@ -41,7 +41,8 @@ endif
$(foreach p, $(active_protocol_directories), src/proto_$(p)/bin_baker/main_baker_$(p).exe) \
$(foreach p, $(active_protocol_directories), src/proto_$(p)/bin_endorser/main_endorser_$(p).exe) \
$(foreach p, $(active_protocol_directories), src/proto_$(p)/bin_accuser/main_accuser_$(p).exe) \
$(foreach p, $(active_protocol_directories), src/proto_$(p)/lib_parameters/sandbox-parameters.json)
$(foreach p, $(active_protocol_directories), src/proto_$(p)/lib_parameters/sandbox-parameters.json) \
$(foreach p, $(active_protocol_directories), src/proto_$(p)/lib_parameters/test-parameters.json)
@cp _build/default/src/bin_node/main.exe tezos-node
@cp _build/default/src/bin_validation/main_validator.exe tezos-validator
@cp _build/default/src/bin_client/main_client.exe tezos-client
......@@ -53,7 +54,8 @@ endif
cp _build/default/src/proto_$$p/bin_baker/main_baker_$$p.exe tezos-baker-`echo $$p | tr -- _ -` ; \
cp _build/default/src/proto_$$p/bin_endorser/main_endorser_$$p.exe tezos-endorser-`echo $$p | tr -- _ -` ; \
cp _build/default/src/proto_$$p/bin_accuser/main_accuser_$$p.exe tezos-accuser-`echo $$p | tr -- _ -` ; \
cp _build/default/src/proto_$$p/lib_parameters/sandbox-parameters.json sandbox-parameters.json ; \
cp _build/default/src/proto_$$p/lib_parameters/sandbox-parameters.json src/proto_$$p/parameters/sandbox-parameters.json ; \
cp _build/default/src/proto_$$p/lib_parameters/test-parameters.json src/proto_$$p/parameters/test-parameters.json ; \
done
PROTOCOLS := $(wildcard src/proto_*)
......
......@@ -129,7 +129,7 @@ main () {
local_signer="${local_signer:-$bin_dir/../../_build/default/src/bin_signer/main_signer.exe}"
local_compiler="${local_compiler:-$bin_dir/../../_build/default/src/lib_protocol_compiler/main_native.exe}"
parameters_file="$bin_dir/../../sandbox-parameters.json"
parameters_file="$bin_dir/../proto_alpha/parameters/sandbox-parameters.json"
else
# we assume a clean install with tezos-(admin-)client in the path
......
......@@ -540,8 +540,9 @@ module Manpage = struct
`I
( "$(b,Run in sandbox mode listening to RPC commands at localhost \
port 8732)",
"$(mname) run --sandbox=sandbox-parameters.json --data-dir \
/custom/data/dir --rpc-addr localhost:8732" );
"$(mname) run \
--sandbox=src/proto_alpha/parameters/sandbox-parameters.json \
--data-dir /custom/data/dir --rpc-addr localhost:8732" );
`I ("$(b,Run a node that accepts network connections)", "$(mname) run")
]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment