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

2018-11-20 16:36:52 -05:00 · 2018-11-20 16:36:52 -05:00 · 1b57ea6f37
parent 87ffafeb54 a4751c7abf
commit 1b57ea6f37
2 changed files with 10 additions and 6 deletions
--- a/11
+++ b/11
@ -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
--- a/app.go
+++ b/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