mirror of
https://github.com/writefreely/writefreely
synced 2024-11-24 09:33:11 +00:00
Merge branch 'master' of github.com:writeas/writefreely
This commit is contained in:
commit
1b57ea6f37
2 changed files with 10 additions and 6 deletions
11
Makefile
11
Makefile
|
@ -1,7 +1,10 @@
|
|||
GITREV=`git describe --tags | cut -c 2-`
|
||||
LDFLAGS=-ldflags="-X 'github.com/writeas/writefreely.softwareVer=$(GITREV)'"
|
||||
|
||||
GOCMD=go
|
||||
GOINSTALL=$(GOCMD) install
|
||||
GOBUILD=$(GOCMD) build
|
||||
GOTEST=$(GOCMD) test
|
||||
GOINSTALL=$(GOCMD) install $(LDFLAGS)
|
||||
GOBUILD=$(GOCMD) build $(LDFLAGS)
|
||||
GOTEST=$(GOCMD) test $(LDFLAGS)
|
||||
GOGET=$(GOCMD) get
|
||||
BINARY_NAME=writefreely
|
||||
|
||||
|
@ -58,6 +61,6 @@ ui : force_look
|
|||
clean :
|
||||
-rm -rf build
|
||||
cd less/; $(MAKE) clean $(MFLAGS)
|
||||
|
||||
|
||||
force_look :
|
||||
true
|
||||
|
|
5
app.go
5
app.go
|
@ -33,10 +33,11 @@ const (
|
|||
|
||||
serverSoftware = "WriteFreely"
|
||||
softwareURL = "https://writefreely.org"
|
||||
|
||||
softwareVer = "0.3"
|
||||
)
|
||||
|
||||
// Software version can be set from git env using -ldflags
|
||||
var softwareVer = "0.3"
|
||||
|
||||
var (
|
||||
debugging bool
|
||||
|
||||
|
|
Loading…
Reference in a new issue