Writefreely
/
writefreely
mirror of https://github.com/writeas/writefreely
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:writeas/writefreely

This commit is contained in:
Matt Baer 2018-11-20 16:36:52 -05:00
parent 87ffafeb54 a4751c7abf
commit 1b57ea6f37
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -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
@ -58,6 +61,6 @@ ui : force_look
clean : clean :
-rm -rf build -rm -rf build
cd less/; $(MAKE) clean $(MFLAGS) cd less/; $(MAKE) clean $(MFLAGS)
force_look : force_look :
true true

5
app.go
View File

@ -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