Merge branch 'master' of github.com:writeas/writefreely
This commit is contained in:
commit
1b57ea6f37
9
Makefile
9
Makefile
|
@ -1,7 +1,10 @@
|
||||||
|
GITREV=`git describe --tags | cut -c 2-`
|
||||||
|
LDFLAGS=-ldflags="-X 'github.com/writeas/writefreely.softwareVer=$(GITREV)'"
|
||||||
|
|
||||||
GOCMD=go
|
GOCMD=go
|
||||||
GOINSTALL=$(GOCMD) install
|
GOINSTALL=$(GOCMD) install $(LDFLAGS)
|
||||||
GOBUILD=$(GOCMD) build
|
GOBUILD=$(GOCMD) build $(LDFLAGS)
|
||||||
GOTEST=$(GOCMD) test
|
GOTEST=$(GOCMD) test $(LDFLAGS)
|
||||||
GOGET=$(GOCMD) get
|
GOGET=$(GOCMD) get
|
||||||
BINARY_NAME=writefreely
|
BINARY_NAME=writefreely
|
||||||
|
|
||||||
|
|
5
app.go
5
app.go
|
@ -33,10 +33,11 @@ const (
|
||||||
|
|
||||||
serverSoftware = "WriteFreely"
|
serverSoftware = "WriteFreely"
|
||||||
softwareURL = "https://writefreely.org"
|
softwareURL = "https://writefreely.org"
|
||||||
|
|
||||||
softwareVer = "0.3"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Software version can be set from git env using -ldflags
|
||||||
|
var softwareVer = "0.3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
debugging bool
|
debugging bool
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue