From 522a849ba905f3cc602a26d63256045c83779b8b Mon Sep 17 00:00:00 2001 From: Marko Date: Mon, 16 Sep 2019 10:46:10 +0200 Subject: [PATCH] get_tools = tools (#3988) - in the makefile update `get_tools` was changed to just `tools` Signed-off-by: Marko Baricevic --- DOCKER/Dockerfile.abci | 2 +- Vagrantfile | 2 +- docs/app-dev/abci-cli.md | 2 +- docs/app-dev/getting-started.md | 2 +- docs/introduction/install.md | 2 +- docs/tools/monitoring.md | 2 +- networks/remote/integration.sh | 2 +- scripts/dist.sh | 2 +- scripts/install/install_tendermint_arm.sh | 2 +- scripts/install/install_tendermint_bsd.sh | 2 +- scripts/install/install_tendermint_osx.sh | 2 +- scripts/install/install_tendermint_ubuntu.sh | 2 +- tools/build/Makefile | 4 ++-- tools/tm-bench/Dockerfile.dev | 2 +- tools/tm-monitor/Dockerfile.dev | 2 +- tools/tm-monitor/README.md | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/DOCKER/Dockerfile.abci b/DOCKER/Dockerfile.abci index c6ec05f6..52a3d9e0 100644 --- a/DOCKER/Dockerfile.abci +++ b/DOCKER/Dockerfile.abci @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \ COPY Gopkg.toml /go/src/github.com/tendermint/abci/ COPY Gopkg.lock /go/src/github.com/tendermint/abci/ -RUN make get_tools +RUN make tools # see https://github.com/golang/dep/issues/1312 RUN dep ensure -vendor-only diff --git a/Vagrantfile b/Vagrantfile index 67de7429..3367a908 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -57,6 +57,6 @@ Vagrant.configure("2") do |config| # get all deps and tools, ready to install/test su - vagrant -c 'source /home/vagrant/.bash_profile' - su - vagrant -c 'cd /home/vagrant/go/src/github.com/tendermint/tendermint && make get_tools' + su - vagrant -c 'cd /home/vagrant/go/src/github.com/tendermint/tendermint && make tools' SHELL end diff --git a/docs/app-dev/abci-cli.md b/docs/app-dev/abci-cli.md index 4b21a4b2..c426b8cf 100644 --- a/docs/app-dev/abci-cli.md +++ b/docs/app-dev/abci-cli.md @@ -15,7 +15,7 @@ mkdir -p $GOPATH/src/github.com/tendermint cd $GOPATH/src/github.com/tendermint git clone https://github.com/tendermint/tendermint.git cd tendermint -make get_tools +make tools make install_abci ``` diff --git a/docs/app-dev/getting-started.md b/docs/app-dev/getting-started.md index eff70db6..8b97338d 100644 --- a/docs/app-dev/getting-started.md +++ b/docs/app-dev/getting-started.md @@ -27,7 +27,7 @@ Then run ``` go get github.com/tendermint/tendermint cd $GOPATH/src/github.com/tendermint/tendermint -make get_tools +make tools make install_abci ``` diff --git a/docs/introduction/install.md b/docs/introduction/install.md index 0a013bed..39825dae 100644 --- a/docs/introduction/install.md +++ b/docs/introduction/install.md @@ -28,7 +28,7 @@ cd tendermint ### Get Tools & Dependencies ``` -make get_tools +make tools ``` ### Compile diff --git a/docs/tools/monitoring.md b/docs/tools/monitoring.md index 26b90ed7..0653a563 100644 --- a/docs/tools/monitoring.md +++ b/docs/tools/monitoring.md @@ -87,6 +87,6 @@ websocket. ## Development ``` -make get_tools +make tools make test ``` diff --git a/networks/remote/integration.sh b/networks/remote/integration.sh index c2d7c3a3..6ff02cb6 100644 --- a/networks/remote/integration.sh +++ b/networks/remote/integration.sh @@ -30,7 +30,7 @@ go get $REPO cd $GOPATH/src/$REPO ## build -make get_tools +make tools make build # generate an ssh key diff --git a/scripts/dist.sh b/scripts/dist.sh index ac62f109..81fdf981 100755 --- a/scripts/dist.sh +++ b/scripts/dist.sh @@ -29,7 +29,7 @@ XC_OS=${XC_OS:-"solaris darwin freebsd linux windows"} XC_EXCLUDE=${XC_EXCLUDE:-" darwin/arm solaris/amd64 solaris/386 solaris/arm freebsd/amd64 windows/arm "} # Make sure build tools are available. -make get_tools +make tools # Build! # ldflags: -s Omit the symbol table and debug information. diff --git a/scripts/install/install_tendermint_arm.sh b/scripts/install/install_tendermint_arm.sh index 085ba82f..cd2e18c9 100644 --- a/scripts/install/install_tendermint_arm.sh +++ b/scripts/install/install_tendermint_arm.sh @@ -31,7 +31,7 @@ cd "$GOPATH/src/$REPO" git checkout $BRANCH # XXX: uncomment if branch isn't master # git fetch origin $BRANCH -make get_tools +make tools make install # the binary is located in $GOPATH/bin diff --git a/scripts/install/install_tendermint_bsd.sh b/scripts/install/install_tendermint_bsd.sh index 294155d0..c69e6269 100644 --- a/scripts/install/install_tendermint_bsd.sh +++ b/scripts/install/install_tendermint_bsd.sh @@ -46,7 +46,7 @@ cd "$GOPATH/src/$REPO" # build & install master git checkout $BRANCH -gmake get_tools +gmake tools gmake install # the binary is located in $GOPATH/bin diff --git a/scripts/install/install_tendermint_osx.sh b/scripts/install/install_tendermint_osx.sh index ee799f66..be2c4d0e 100644 --- a/scripts/install/install_tendermint_osx.sh +++ b/scripts/install/install_tendermint_osx.sh @@ -36,5 +36,5 @@ cd $GOPATH/src/$REPO git checkout $BRANCH # XXX: uncomment if branch isn't master # git fetch origin $BRANCH -make get_tools +make tools make install diff --git a/scripts/install/install_tendermint_ubuntu.sh b/scripts/install/install_tendermint_ubuntu.sh index 2e5558ff..b562498f 100644 --- a/scripts/install/install_tendermint_ubuntu.sh +++ b/scripts/install/install_tendermint_ubuntu.sh @@ -40,7 +40,7 @@ cd "$GOPATH/src/$REPO" git checkout $BRANCH # XXX: uncomment if branch isn't master # git fetch origin $BRANCH -make get_tools +make tools make install # the binary is located in $GOPATH/bin diff --git a/tools/build/Makefile b/tools/build/Makefile index 8c33ffd5..df138706 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -64,7 +64,7 @@ build-tendermint: git-branch gopath-setup @echo "*** Building tendermint" go get -d -u github.com/tendermint/tendermint/cmd/tendermint cd $(GOPATH)/src/github.com/tendermint/tendermint && git checkout "$(GIT_BRANCH)" && git pull - export PATH=$(GOPATH)/bin:$(PATH) && $(MAKE) -C $(GOPATH)/src/github.com/tendermint/tendermint get_tools build + export PATH=$(GOPATH)/bin:$(PATH) && $(MAKE) -C $(GOPATH)/src/github.com/tendermint/tendermint tools build cp $(GOPATH)/src/github.com/tendermint/tendermint/build/tendermint $(GOPATH)/bin @echo "*** Built tendermint" @@ -87,7 +87,7 @@ build-basecoind: git-branch gopath-setup @echo "*** Building basecoind from cosmos-sdk" go get -d -u github.com/cosmos/cosmos-sdk/examples/basecoin/cmd/basecoind cd $(GOPATH)/src/github.com/cosmos/cosmos-sdk && git checkout "$(GIT_BRANCH)" && git pull - export PATH=$(GOPATH)/bin:$(PATH) && $(MAKE) -C $(GOPATH)/src/github.com/cosmos/cosmos-sdk get_tools build + export PATH=$(GOPATH)/bin:$(PATH) && $(MAKE) -C $(GOPATH)/src/github.com/cosmos/cosmos-sdk tools build cp $(GOPATH)/src/github.com/cosmos/cosmos-sdk/build/basecoind $(GOPATH)/bin/basecoind @echo "*** Built basecoind from cosmos-sdk" diff --git a/tools/tm-bench/Dockerfile.dev b/tools/tm-bench/Dockerfile.dev index 1151965a..73c26333 100644 --- a/tools/tm-bench/Dockerfile.dev +++ b/tools/tm-bench/Dockerfile.dev @@ -5,7 +5,7 @@ WORKDIR /go/src/github.com/tendermint/tendermint/tools/tm-bench COPY Makefile /go/src/github.com/tendermint/tendermint/tools/tm-bench/ -RUN make get_tools +RUN make tools COPY . /go/src/github.com/tendermint/tendermint/tools/tm-bench diff --git a/tools/tm-monitor/Dockerfile.dev b/tools/tm-monitor/Dockerfile.dev index e593bf89..347c7f0f 100644 --- a/tools/tm-monitor/Dockerfile.dev +++ b/tools/tm-monitor/Dockerfile.dev @@ -5,7 +5,7 @@ WORKDIR /go/src/github.com/tendermint/tools/tm-monitor COPY Makefile /go/src/github.com/tendermint/tools/tm-monitor/ -RUN make get_tools +RUN make tools COPY . /go/src/github.com/tendermint/tools/tm-monitor diff --git a/tools/tm-monitor/README.md b/tools/tm-monitor/README.md index 2bd367b9..1a8dfffc 100644 --- a/tools/tm-monitor/README.md +++ b/tools/tm-monitor/README.md @@ -86,6 +86,6 @@ websocket. ## Development ``` -make get_tools +make tools make test ```