Merge pull request #2078 from nanoant/patch/makefile-improvements

Makefile improvements
This commit is contained in:
Unknwon 2015-12-01 17:26:25 -05:00
commit 7ccce4d110
2 changed files with 17 additions and 10 deletions

View File

@ -1,6 +1,10 @@
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')" LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)" LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"
DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)
GENERATED := modules/bindata/bindata.go public/css/gogs.css
TAGS = "" TAGS = ""
RELEASE_ROOT = "release" RELEASE_ROOT = "release"
@ -9,9 +13,9 @@ NOW = $(shell date -u '+%Y%m%d%I%M%S')
.PHONY: build pack release bindata clean .PHONY: build pack release bindata clean
build: build: $(GENERATED)
go install -ldflags '$(LDFLAGS)' -tags '$(TAGS)' go install -ldflags '$(LDFLAGS)' -tags '$(TAGS)'
go build -ldflags '$(LDFLAGS)' -tags '$(TAGS)' cp '$(GOPATH)/bin/gogs' .
govet: govet:
go tool vet -composites=false -methods=false -structtags=false . go tool vet -composites=false -methods=false -structtags=false .
@ -25,8 +29,15 @@ pack:
release: build pack release: build pack
bindata: bindata: modules/bindata/bindata.go
go-bindata -o=modules/bindata/bindata.go -ignore="\\.DS_Store|README.md" -pkg=bindata conf/...
modules/bindata/bindata.go: $(DATA_FILES)
go-bindata -o=$@ -ignore="\\.DS_Store|README.md" -pkg=bindata conf/...
less: public/css/gogs.css
public/css/gogs.css: $(LESS_FILES)
lessc $< $@
clean: clean:
go clean -i ./... go clean -i ./...

View File

@ -1,4 +0,0 @@
#!/bin/sh
echo "compiling LESS Files"
lessc ../public/less/gogs.less ../public/css/gogs.css
echo "done"