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

Makefile: rename tezos-$protocol-baker to tezos-baker-$protocol

Browse Source
This commit is contained in:
Grégoire Henry 2018-07-18 23:42:31 +02:00
parent 152134947b
commit c91f082a28
No known key found for this signature in database
GPG Key ID: 50D984F20BD445D2
10 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.dockerignore
View File

@ -16,9 +16,9 @@ tezos-node
tezos-protocol-compiler tezos-protocol-compiler
tezos-client tezos-client
tezos-admin-client tezos-admin-client
tezos-alpha-baker tezos-baker-*
tezos-alpha-endorser tezos-endorser-*
tezos-alpha-accuser tezos-accuser-*
tezos-signer tezos-signer
scripts/opam-test-all.sh.DONE scripts/opam-test-all.sh.DONE

6
.gitignore vendored
View File

@ -16,9 +16,9 @@ __pycache__
/tezos-protocol-compiler /tezos-protocol-compiler
/tezos-client /tezos-client
/tezos-admin-client /tezos-admin-client
/tezos-alpha-baker /tezos-baker-*
/tezos-alpha-endorser /tezos-endorser-*
/tezos-alpha-accuser /tezos-accuser-*
/tezos-signer /tezos-signer
/scripts/opam-test-all.sh.DONE /scripts/opam-test-all.sh.DONE

8
Makefile
View File

@ -33,9 +33,9 @@ endif
@cp _build/default/src/bin_signer/main_signer.exe tezos-signer @cp _build/default/src/bin_signer/main_signer.exe tezos-signer
@cp _build/default/src/lib_protocol_compiler/main_native.exe tezos-protocol-compiler @cp _build/default/src/lib_protocol_compiler/main_native.exe tezos-protocol-compiler
@for p in $(active_protocol_directories) ; do \ @for p in $(active_protocol_directories) ; do \
cp _build/default/src/proto_$$p/bin_baker/main_baker_$$p.exe tezos-`echo $$p | tr -- _ -`-baker ; \ 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-`echo $$p | tr -- _ -`-endorser ; \ 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-`echo $$p | tr -- _ -`-accuser ; \ cp _build/default/src/proto_$$p/bin_accuser/main_accuser_$$p.exe tezos-accuser-`echo $$p | tr -- _ -` ; \
done done
all.pkg: all.pkg:
@ -93,7 +93,7 @@ clean:
tezos-signer \ tezos-signer \
tezos-admin-client \ tezos-admin-client \
tezos-protocol-compiler \ tezos-protocol-compiler \
$(foreach p, $(active_protocol_versions), tezos-$(p)-baker tezos-$(p)-endorser tezos-$(p)-accuser) $(foreach p, $(active_protocol_versions), tezos-baker-$(p) tezos-endorser-$(p) tezos-accuser-$(p))
@-${MAKE} -C docs clean @-${MAKE} -C docs clean
.PHONY: all test build-deps docker-image clean .PHONY: all test build-deps docker-image clean

9
docs/introduction/howto.rst
View File

@ -64,12 +64,14 @@ At last, compile the project:
make make
This should produce three binaries: This should produce several binaries:
- ``tezos-node``: the tezos daemon itself; - ``tezos-node``: the tezos daemon itself;
- ``tezos-client``: a command-line client; - ``tezos-client``: a command-line client;
- ``tezos-admin-client``: a command-line administration tool for the node; - ``tezos-admin-client``: a command-line administration tool for the node;
- ``tezos-alpha-baker``: a client and daemon to bake on the Tezos network; - ``tezos-baker-alpha``: a client and daemon to bake on the Tezos network;
- ``tezos-endorser-alpha``: a client and daemon to bake on the Tezos network;
- ``tezos-accuser-alpha``: a client and daemon to bake on the Tezos network;
- ``tezos-protocol-compiler``: a protocol compiler used for developing - ``tezos-protocol-compiler``: a protocol compiler used for developing
new version of the economic protocol. new version of the economic protocol.
@ -180,7 +182,8 @@ To interact with your node, read the doc of clients:
./tezos-client man ./tezos-client man
./tezos-admin-client man ./tezos-admin-client man
./tezos-alpha-baker man ./tezos-baker-alpha man
./tezos-signer man
And read :ref:`this section<faucet>` to learn how to get alphanet tezzies. And read :ref:`this section<faucet>` to learn how to get alphanet tezzies.

6
docs/whitedoc/the_big_picture.rst
View File

@ -312,11 +312,11 @@ The Final Executables
comand line wallet, the latter an administration tool for the comand line wallet, the latter an administration tool for the
node. It also provides a shell script that configures a shell node. It also provides a shell script that configures a shell
environment to interact with a sandboxed node. environment to interact with a sandboxed node.
- :package:`tezos-baker-alpha` provides the ``tezos-alpha-baker`` - :package:`tezos-baker-alpha` provides the ``tezos-baker-alpha``
binary. binary.
- :package:`tezos-endorser-alpha` provides the ``tezos-alpha-endorser`` - :package:`tezos-endorser-alpha` provides the ``tezos-endorser-alpha``
binary. binary.
- :package:`tezos-accuser-alpha` provides the ``tezos-alpha-accuser`` - :package:`tezos-accuser-alpha` provides the ``tezos-accuser-alpha``
binary. binary.
- :package:`tezos-protocol-compiler` provides the - :package:`tezos-protocol-compiler` provides the
``tezos-protocol-compiler`` binary that is used by the node to ``tezos-protocol-compiler`` binary that is used by the node to

1
scripts/ci/create_docker_image.build.sh
View File

@ -25,6 +25,7 @@ base_image="${3-${image_name}_deps:${image_version}}"
mkdir -p "$tmp_dir"/tezos/scripts mkdir -p "$tmp_dir"/tezos/scripts
cp -a Makefile "$tmp_dir"/tezos cp -a Makefile "$tmp_dir"/tezos
cp -a active_protocol_versions "$tmp_dir"/tezos
cp -a scripts/version.sh "$tmp_dir"/tezos/scripts/ cp -a scripts/version.sh "$tmp_dir"/tezos/scripts/
cp -a src "$tmp_dir"/tezos cp -a src "$tmp_dir"/tezos
cp -a vendors "$tmp_dir"/tezos cp -a vendors "$tmp_dir"/tezos

2
scripts/ci/create_docker_image.minimal.sh
View File

@ -27,7 +27,7 @@ trap cleanup EXIT INT
mkdir -p "$tmp_dir"/bin mkdir -p "$tmp_dir"/bin
mkdir -p "$tmp_dir"/scripts mkdir -p "$tmp_dir"/scripts
container=$(docker create $build_image) container=$(docker create $build_image)
versioned_daemons="$(sed "s/^\(.*\)$/tezos-\1-baker tezos-\1-endorser tezos-\1-accuser/g" "active_protocol_versions")" versioned_daemons="$(sed "s/^\(.*\)$/tezos-baker-\1 tezos-endorser-\1 tezos-accuser-\1/g" "active_protocol_versions")"
for bin in tezos-client tezos-admin-client tezos-node $versioned_daemons tezos-signer; do for bin in tezos-client tezos-admin-client tezos-node $versioned_daemons tezos-signer; do
docker cp -L $container:/home/tezos/tezos/$bin "$tmp_dir"/bin docker cp -L $container:/home/tezos/tezos/$bin "$tmp_dir"/bin
done done

6
scripts/docker/entrypoint.sh
View File

@ -14,9 +14,9 @@ bin_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
node="/usr/local/bin/tezos-node" node="/usr/local/bin/tezos-node"
client="/usr/local/bin/tezos-client" client="/usr/local/bin/tezos-client"
admin_client="/usr/local/bin/tezos-admin-client" admin_client="/usr/local/bin/tezos-admin-client"
baker="/usr/local/bin/tezos-$PROTOCOL-baker" baker="/usr/local/bin/tezos-baker-$PROTOCOL"
endorser="/usr/local/bin/tezos-$PROTOCOL-endorser" endorser="/usr/local/bin/tezos-endorser-$PROTOCOL"
accuser="/usr/local/bin/tezos-$PROTOCOL-accuser" accuser="/usr/local/bin/tezos-accuser-$PROTOCOL"
signer="/usr/local/bin/tezos-signer" signer="/usr/local/bin/tezos-signer"
client_dir="$DATA_DIR/client" client_dir="$DATA_DIR/client"

6
src/bin_client/bash-completion.sh
View File

@ -48,7 +48,7 @@ _tezos-alphanet_complete()
# Register _pss_complete to provide completion for the following commands # Register _pss_complete to provide completion for the following commands
complete -F _tezos-client_complete tezos-client complete -F _tezos-client_complete tezos-client
complete -F _tezos-client_complete tezos-admin-client complete -F _tezos-client_complete tezos-admin-client
complete -F _tezos-client_complete tezos-alpha-baker complete -F _tezos-client_complete tezos-baker-alpha
complete -F _tezos-client_complete tezos-alpha-endorser complete -F _tezos-client_complete tezos-endorser-alpha
complete -F _tezos-client_complete tezos-alpha-accuser complete -F _tezos-client_complete tezos-accuser-alpha
complete -F _tezos-alphanet_complete alphanet.sh complete -F _tezos-alphanet_complete alphanet.sh

28
src/bin_client/tezos-init-sandboxed-client.sh
View File

@ -118,7 +118,7 @@ wait_for_the_node_to_be_bootstraped() {
## Baker ################################################################### ## Baker ###################################################################
check_baker() { check_baker() {
pids=$(pgrep -x tezos-alpha-baker 2>/dev/null) pids=$(pgrep -x tezos-baker-alpha 2>/dev/null)
for pid in $pids; do for pid in $pids; do
if grep -- "-max-priority" "/proc/$pid/cmdline" >/dev/null 2>&1 ; then if grep -- "-max-priority" "/proc/$pid/cmdline" >/dev/null 2>&1 ; then
return 0 return 0
@ -137,7 +137,7 @@ run_baker() {
} }
stop_baker() { stop_baker() {
pids=$(pgrep -x tezos-alpha-baker 2>/dev/null) pids=$(pgrep -x tezos-baker-alpha 2>/dev/null)
for pid in $pids; do for pid in $pids; do
if grep -- "-max-priority" "/proc/$pid/cmdline" >/dev/null 2>&1 ; then if grep -- "-max-priority" "/proc/$pid/cmdline" >/dev/null 2>&1 ; then
echo "Killing the baker..." echo "Killing the baker..."
@ -276,9 +276,9 @@ main () {
# we assume a clean install with tezos-(admin-)client in the path # we assume a clean install with tezos-(admin-)client in the path
local_client="${local_client:-$(which tezos-client)}" local_client="${local_client:-$(which tezos-client)}"
local_admin_client="${local_admin_client:-$(which tezos-admin-client)}" local_admin_client="${local_admin_client:-$(which tezos-admin-client)}"
local_alpha_baker="${local_alpha_baker:-$(which tezos-alpha-baker)}" local_alpha_baker="${local_alpha_baker:-$(which tezos-baker-alpha)}"
local_alpha_endorser="${local_alpha_endorser:-$(which tezos-alpha-endorser)}" local_alpha_endorser="${local_alpha_endorser:-$(which tezos-endorser-alpha)}"
local_alpha_accuser="${local_alpha_accuser:-$(which tezos-alpha-accuser)}" local_alpha_accuser="${local_alpha_accuser:-$(which tezos-accuser-alpha)}"
local_signer="${local_signer:-$(which tezos-signer)}" local_signer="${local_signer:-$(which tezos-signer)}"
fi fi
@ -301,17 +301,17 @@ main () {
echo "exec $admin_client \"\$@\"" >> $client_dir/bin/tezos-admin-client echo "exec $admin_client \"\$@\"" >> $client_dir/bin/tezos-admin-client
chmod +x $client_dir/bin/tezos-admin-client chmod +x $client_dir/bin/tezos-admin-client
echo '#!/bin/sh' > $client_dir/bin/tezos-alpha-baker echo '#!/bin/sh' > $client_dir/bin/tezos-baker-alpha
echo "exec $alpha_baker \"\$@\"" >> $client_dir/bin/tezos-alpha-baker echo "exec $alpha_baker \"\$@\"" >> $client_dir/bin/tezos-baker-alpha
chmod +x $client_dir/bin/tezos-alpha-baker chmod +x $client_dir/bin/tezos-baker-alpha
echo '#!/bin/sh' > $client_dir/bin/tezos-alpha-endorser echo '#!/bin/sh' > $client_dir/bin/tezos-endorser-alpha
echo "exec $alpha_endorser \"\$@\"" >> $client_dir/bin/tezos-alpha-endorser echo "exec $alpha_endorser \"\$@\"" >> $client_dir/bin/tezos-endorser-alpha
chmod +x $client_dir/bin/tezos-alpha-endorser chmod +x $client_dir/bin/tezos-endorser-alpha
echo '#!/bin/sh' > $client_dir/bin/tezos-alpha-accuser echo '#!/bin/sh' > $client_dir/bin/tezos-accuser-alpha
echo "exec $alpha_accuser \"\$@\"" >> $client_dir/bin/tezos-alpha-accuser echo "exec $alpha_accuser \"\$@\"" >> $client_dir/bin/tezos-accuser-alpha
chmod +x $client_dir/bin/tezos-alpha-accuser chmod +x $client_dir/bin/tezos-accuser-alpha
echo '#!/bin/sh' > $client_dir/bin/tezos-signer echo '#!/bin/sh' > $client_dir/bin/tezos-signer
echo "exec $signer \"\$@\"" >> $client_dir/bin/tezos-signer echo "exec $signer \"\$@\"" >> $client_dir/bin/tezos-signer