From 2a468341686bf279bf06ce00c74f3a6fe8bca863 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Mon, 5 Dec 2016 17:22:18 +0100 Subject: [PATCH] Dropped bindata task from makefile, it's the generate task now --- Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 03b4c7cb5..ef2dcb148 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ IMPORT := code.gitea.io/gitea SHA := $(shell git rev-parse --short HEAD) DATE := $(shell date -u '+%Y-%m-%d %I:%M:%S %Z') -BINDATA := $(shell find conf | sed 's/ /\\ /g') STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less) JAVASCRIPTS := @@ -115,19 +114,6 @@ release-copy: release-check: cd $(DIST)/release; $(foreach file,$(wildcard $(DIST)/release/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;) -.PHONY: bindata -bindata: modules/bindata/bindata.go - -.IGNORE: modules/bindata/bindata.go -modules/bindata/bindata.go: $(BINDATA) - @which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \ - go get -u github.com/jteeuwen/go-bindata/...; \ - fi - go-bindata -o=$@ -ignore="\\.go|README.md|TRANSLATORS" -pkg=bindata conf/... - go fmt $@ - sed -i.bak 's/confLocaleLocale_/confLocaleLocale/' $@ - rm $@.bak - .PHONY: javascripts javascripts: public/js/index.js @@ -143,4 +129,4 @@ public/css/index.css: $(STYLESHEETS) lessc $< $@ .PHONY: assets -assets: bindata javascripts stylesheets +assets: javascripts stylesheets