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

Merge branch 'master' into codehighlight 

* master:
  Don't automatically include "v"  from git
  Get versioninfo from the git repository
This commit is contained in:
Marcel van der Boom 2018-11-20 18:24:36 +01:00
parent 348d548793 a4751c7abf
commit ed3ea37537
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
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
@ -29,6 +32,6 @@ ui : force_look
clean :
cd less/; $(MAKE) clean $(MFLAGS)
force_look :
true

5
app.go
View File

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