diff options
| author | Thomas Boerger <thomas@webhippie.de> | 2016-11-29 17:26:36 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2016-11-30 00:26:36 +0800 |
| commit | b6a95a8cb3d9e611caf1bb8c0d3ff773e00923d6 (patch) | |
| tree | 2717811fd5b10ebaddccf3ab18070c7bc71afaec /Makefile | |
| parent | 4680c349ddea56e2a6a603c2d0a54bf2bb5bfe86 (diff) | |
| download | gitea-b6a95a8cb3d9e611caf1bb8c0d3ff773e00923d6.tar.gz gitea-b6a95a8cb3d9e611caf1bb8c0d3ff773e00923d6.zip | |
Integrate public as bindata optionally (#293)
* Dropped unused codekit config
* Integrated dynamic and static bindata for public
* Ignore public bindata
* Add a general generate make task
* Integrated flexible public assets into web command
* Updated vendoring, added all missiong govendor deps
* Made the linter happy with the bindata and dynamic code
* Moved public bindata definition to modules directory
* Ignoring the new bindata path now
* Updated to the new public modules import path
* Updated public bindata command and drop the new prefix
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -37,12 +37,6 @@ clean: go clean -i ./... rm -rf $(BIN) $(DIST) -.PHONY: deps -deps: - @which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \ - go get -u github.com/jteeuwen/go-bindata/...; \ - fi - .PHONY: fmt fmt: go fmt $(PACKAGES) @@ -51,6 +45,13 @@ fmt: vet: go vet $(PACKAGES) +.PHONY: generate +generate: + @which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \ + go get -u github.com/jteeuwen/go-bindata/...; \ + fi + go generate $(PACKAGES) + .PHONY: errcheck errcheck: @which errcheck > /dev/null; if [ $$? -ne 0 ]; then \ @@ -129,6 +130,9 @@ 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/' $@ @@ -148,5 +152,5 @@ stylesheets: public/css/index.css public/css/index.css: $(STYLESHEETS) lessc $< $@ -.PHONY: generate -generate: bindata javascripts stylesheets +.PHONY: assets +assets: bindata javascripts stylesheets |