diff options
| author | Unknwon <u@gogs.io> | 2015-12-01 17:26:25 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-12-01 17:26:25 -0500 |
| commit | 7ccce4d1102508cf1f993bde31bf502eb142a991 (patch) | |
| tree | dd0ec6897e8d6696043ae0f43f4ebdfb8c8e3dba | |
| parent | 9ed60d96a9cecb5649691221432501b59fbe133d (diff) | |
| parent | e5fe367b824965c8c3186888063c14e59e73946d (diff) | |
| download | gitea-7ccce4d1102508cf1f993bde31bf502eb142a991.tar.gz gitea-7ccce4d1102508cf1f993bde31bf502eb142a991.zip | |
Merge pull request #2078 from nanoant/patch/makefile-improvements
Makefile improvements
| -rw-r--r-- | Makefile | 23 | ||||
| -rwxr-xr-x | scripts/less.sh | 4 |
2 files changed, 17 insertions, 10 deletions
@@ -1,17 +1,21 @@ 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)" +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 = "" RELEASE_ROOT = "release" RELEASE_GOGS = "release/gogs" 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 build -ldflags '$(LDFLAGS)' -tags '$(TAGS)' + cp '$(GOPATH)/bin/gogs' . govet: go tool vet -composites=false -methods=false -structtags=false . @@ -25,11 +29,18 @@ pack: release: build pack -bindata: - go-bindata -o=modules/bindata/bindata.go -ignore="\\.DS_Store|README.md" -pkg=bindata conf/... +bindata: modules/bindata/bindata.go + +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: go clean -i ./... clean-mac: clean - find . -name ".DS_Store" -print0 | xargs -0 rm
\ No newline at end of file + find . -name ".DS_Store" -print0 | xargs -0 rm diff --git a/scripts/less.sh b/scripts/less.sh deleted file mode 100755 index f69424f067..0000000000 --- a/scripts/less.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -echo "compiling LESS Files" -lessc ../public/less/gogs.less ../public/css/gogs.css -echo "done" |