status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removes from cruft from the makefile.

This commit is contained in:
James Phillips 2016-02-17 20:30:06 -08:00
parent 09e60af97c
commit baef89a8f6
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
GNUmakefile
View File

@ -9,15 +9,15 @@ all: format tools
@mkdir -p bin/ @mkdir -p bin/
@bash --norc -i ./scripts/build.sh @bash --norc -i ./scripts/build.sh
# bin generates the releasable binaries # bin generates binaries for all platforms
bin: generate bin:
@sh -c "'$(CURDIR)/scripts/build.sh'" @sh -c "'$(CURDIR)/scripts/build.sh'"
# dev creates binaries for testing locally - these are put into ./bin and $GOPATH # dev creates binaries for testing locally - these are put into ./bin and $GOPATH
dev: generate dev:
@CONSUL_DEV=1 sh -c "'$(CURDIR)/scripts/build.sh'" @CONSUL_DEV=1 sh -c "'$(CURDIR)/scripts/build.sh'"
# dist creates the binaries for distibution # dist packages the binaries for distibution
dist: bin dist: bin
@sh -c "'$(CURDIR)/scripts/dist.sh' $(VERSION)" @sh -c "'$(CURDIR)/scripts/dist.sh' $(VERSION)"
@ -31,7 +31,6 @@ test:
@./scripts/test.sh @./scripts/test.sh
cover: cover:
./scripts/verify_no_uuid.sh
go list ./... | xargs -n1 go test --cover go list ./... | xargs -n1 go test --cover
format: format:
@ -54,12 +53,7 @@ vet:
echo "and fix them if necessary before submitting the code for reviewal."; \ echo "and fix them if necessary before submitting the code for reviewal."; \
fi fi
# generate runs `go generate` to build the dynamically generated source files # generates the static web ui that's compiled into the binary
generate:
find . -type f -name '.DS_Store' -delete
go generate ./...
# generates the static web ui
static-assets: static-assets:
@echo "--> Generating static assets" @echo "--> Generating static assets"
@go-bindata-assetfs -pkg agent -prefix pkg ./pkg/web_ui/... @go-bindata-assetfs -pkg agent -prefix pkg ./pkg/web_ui/...
@ -69,10 +63,4 @@ static-assets:
tools: tools:
go get -u -v $(GOTOOLS) go get -u -v $(GOTOOLS)
web: .PHONY: all bin dev dist cov test cover format vet static-assets tools
./scripts/website_run.sh
web-push:
./scripts/website_push.sh
.PHONY: all bin dev dist cov test vet web web-push generate static-assets tools