From 9d4a480f54b319f4e2704a8685c6755f9aa77cf8 Mon Sep 17 00:00:00 2001 From: Marko Date: Wed, 18 Sep 2019 10:45:03 +0200 Subject: [PATCH] makefile: minor cleanup (#3994) - goimports is not used as a tool anymore - correct me if wrong - rename devtools folder to merely tools.mk - remove slate_header.txt Signed-off-by: Marko Baricevic --- Makefile | 6 +----- rpc/core/README.md | 10 ---------- rpc/core/slate_header.txt | 13 ------------- scripts/devtools/Makefile => tools.mk | 10 ++-------- 4 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 rpc/core/slate_header.txt rename scripts/devtools/Makefile => tools.mk (86%) diff --git a/Makefile b/Makefile index 6870258f6..e7937cfc6 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)" all: check build test install # The below include contains the tools. -include scripts/devtools/Makefile +include tools.mk include tests.mk ######################################## @@ -153,10 +153,6 @@ lint: DESTINATION = ./index.html.md -rpc-docs: - cat rpc/core/slate_header.txt > $(DESTINATION) - godoc2md -template rpc/core/doc_template.txt github.com/tendermint/tendermint/rpc/core | grep -v -e "pipe.go" -e "routes.go" -e "dev.go" | sed 's,/src/target,https://github.com/tendermint/tendermint/tree/master/rpc/core,' >> $(DESTINATION) - ########################################################### ### Docker image diff --git a/rpc/core/README.md b/rpc/core/README.md index 32c3051e3..d767c5f71 100644 --- a/rpc/core/README.md +++ b/rpc/core/README.md @@ -1,15 +1,5 @@ # Tendermint RPC -We are using [Slate](https://github.com/lord/slate) to power our RPC -documentation. For generating markdown use: - -```shell -go get github.com/davecheney/godoc2md - -# from root of this repo -make rpc-docs -``` - ## Pagination Requests that return multiple items will be paginated to 30 items by default. diff --git a/rpc/core/slate_header.txt b/rpc/core/slate_header.txt deleted file mode 100644 index bb4ca6e03..000000000 --- a/rpc/core/slate_header.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: RPC Reference - -language_tabs: # must be one of https://git.io/vQNgJ - - shell - - go - -toc_footers: - - Tendermint - - Documentation Powered by Slate - -search: true ---- diff --git a/scripts/devtools/Makefile b/tools.mk similarity index 86% rename from scripts/devtools/Makefile rename to tools.mk index 1ca24bf9d..f0a8338a6 100644 --- a/scripts/devtools/Makefile +++ b/tools.mk @@ -40,7 +40,6 @@ mkfile_dir := $(shell cd $(shell dirname $(mkfile_path)); pwd) TOOLS_DESTDIR ?= $(GOPATH)/bin -GOIMPORTS = $(TOOLS_DESTDIR)/goimports CERTSTRAP = $(TOOLS_DESTDIR)/certstrap PROTOBUF = $(TOOLS_DESTDIR)/protoc GOX = $(TOOLS_DESTDIR)/gox @@ -48,7 +47,7 @@ GOODMAN = $(TOOLS_DESTDIR)/goodman all: tools -tools: goimports certstrap protobuf gox goodman +tools: certstrap protobuf gox goodman check: check_tools @@ -57,11 +56,6 @@ check_tools: @echo "Found tools: $(foreach tool,$(notdir $(GOTOOLS)),\ $(if $(shell which $(tool)),$(tool),$(error "No $(tool) in PATH")))" -goimports: $(GOIMPORTS) -$(GOIMPORTS): - @echo "Get goimports@v0.0.0-20190628034336-212fb13d595e" - @go get golang.org/x/tools/cmd/goimports@v0.0.0-20190628034336-212fb13d595e - certstrap: $(CERTSTRAP) $(CERTSTRAP): @echo "Get Certstrap" @@ -86,7 +80,7 @@ $(GOODMAN): @go get github.com/snikch/goodman/cmd/goodman@10e37e294daa3c9a90abded60ff9924bafab3888 tools-clean: - rm -f $(CERTSTRAP) $(GOIMPORTS) $(PROTOBUF) $(GOX) $(GOODMAN) + rm -f $(CERTSTRAP) $(PROTOBUF) $(GOX) $(GOODMAN) rm -f tools-stamp .PHONY: all tools tools-clean