From 2932042a6d6dcf8d4f74de0abce688190f2925b9 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Thu, 1 Dec 2016 08:28:43 +0100 Subject: Get rid of bin folder within makefile, enabled TiDB (#319) * Get rid of the bin folder within the build process Signed-off-by: Thomas Boerger * Dropped latest make task, it is unused Signed-off-by: Thomas Boerger * Added tidb tag to drone config Signed-off-by: Thomas Boerger * Dropped the cert build tag Signed-off-by: Thomas Boerger * Dropped useless minwinsvc build tag Signed-off-by: Thomas Boerger * Dropped the useless build tags from drone config Signed-off-by: Thomas Boerger --- Makefile | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5676a836bf..b0f6f70799 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,4 @@ DIST := dist -BIN := bin - EXECUTABLE := gitea IMPORT := code.gitea.io/gitea @@ -35,7 +33,7 @@ all: build .PHONY: clean clean: go clean -i ./... - rm -rf $(BIN) $(DIST) + rm -rf $(EXECUTABLE) $(DIST) .PHONY: fmt fmt: @@ -99,32 +97,17 @@ release-build: @which xgo > /dev/null; if [ $$? -ne 0 ]; then \ go get -u github.com/karalabe/xgo; \ fi - xgo -dest $(BIN) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -targets '$(TARGETS)' -out $(EXECUTABLE)-$(VERSION) $(IMPORT) + xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -targets '$(TARGETS)' -out $(EXECUTABLE)-$(VERSION) $(IMPORT) .PHONY: release-copy release-copy: mkdir -p $(DIST)/release - $(foreach file,$(wildcard $(BIN)/$(EXECUTABLE)-*),cp $(file) $(DIST)/release/$(notdir $(file));) + $(foreach file,$(wildcard $(DIST)/binaries/$(EXECUTABLE)-*),cp $(file) $(DIST)/release/$(notdir $(file));) .PHONY: release-check release-check: cd $(DIST)/release; $(foreach file,$(wildcard $(DIST)/release/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;) -.PHONY: latest -latest: release-build latest-copy latest-check - -.PHONY: latest-copy -latest-copy: - mkdir -p $(DIST)/latest - $(foreach file,$(wildcard $(BIN)/$(EXECUTABLE)-*),cp $(file) $(DIST)/latest/$(subst $(EXECUTABLE)-$(VERSION),$(EXECUTABLE)-latest,$(notdir $(file)));) - -.PHONY: latest-check -latest-check: - cd $(DIST)/latest; $(foreach file,$(wildcard $(DIST)/latest/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;) - -.PHONY: publish -publish: release latest - .PHONY: bindata bindata: modules/bindata/bindata.go -- cgit v1.2.3