Fix for #828

Add build tags to ldflags and print in version output

Signed-off-by: Jonas Östanbäck <[email protected]>

Makefile

@@ -11,7 +11,7 @@ BINDATA := modules/{options,public,templates}/bindata.go
 STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less)
 JAVASCRIPTS :=
 
-LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')"
+LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)"
 
 TARGETS ?= linux/*,darwin/*,windows/*
 PACKAGES ?= $(shell go list ./... | grep -v /vendor/)

main.go

@@ -8,6 +8,7 @@ package main // import "code.gitea.io/gitea"
 
 import (
  "os"
+ "strings"
 
  "code.gitea.io/gitea/cmd"
  "code.gitea.io/gitea/modules/log"
@@ -18,6 +19,9 @@ import (
 // Version holds the current Gitea version
 var Version = "1.1.0+dev"
 
+// Tags holds the build tags used
+var Tags = ""
+
 func init() {
  setting.AppVer = Version
 }
@@ -26,7 +30,7 @@ func main() {
  app := cli.NewApp()
  app.Name = "Gitea"
  app.Usage = "A painless self-hosted Git service"
- app.Version = Version
+ app.Version = Version + formatBuiltWith(Tags)
  app.Commands = []cli.Command{
  cmd.CmdWeb,
  cmd.CmdServ,
@@ -42,3 +46,10 @@ func main() {
  }
 
 }
+
+func formatBuiltWith(Tags string) string {
+ if len(Tags) > 0 {
+ return " built with: " + strings.Join(strings.Split(Tags, " "), ", ")
+ }
+ return ""
+}