Merge branch 'develop'

Author: airnandez

Makefile

@@ -1,12 +1,18 @@
-OS   := $(shell uname -a | cut -f 1 -d ' ' | tr [:upper:] [:lower:])
-ARCH := $(shell uname -m)
-TAG  := $(shell git describe master --tag | cut -f 1 -d '-')
+OS      := $(shell uname -a | cut -f 1 -d ' ' | tr [:upper:] [:lower:])
+ARCH    := $(shell uname -m)
+TAG     := $(shell git describe master --tags)
+TIMESTAMP := $(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
 
-all: build release
+all: build
 
 build:
-	@go build
+	@go build -ldflags="-X main.buildTime '$(TIMESTAMP)' -X main.version '$(TAG)'"
 
-release:
+release: build
 	@echo "Packaging cluefs ${TAG} for ${OS}"
 	@tar -czf cluefs-${TAG}-${OS}-${ARCH}.tar.gz cluefs
+
+clean:
+	@rm cluefs cluefs-*.tar.gz
+
+buildall: clean build

args.go

@@ -374,6 +374,9 @@ func printVersionInfo(f *os.File) {
 	const versionTempl = `
 {{.AppName}} version {{.AppVersion}} ({{.Os}},{{.Arch}})
 
+Built on:
+{{.Sp3}}{{.BuildTime}}
+
 Author:
 {{.Sp3}}Fabio Hernandez
 {{.Sp3}}IN2P3/CNRS computing center, Lyon (France)
@@ -384,6 +387,7 @@ Source code and documentation:
 	fields := map[string]string{
 		"AppName":    programName,
 		"AppVersion": version,
+		"BuildTime":  buildTime,
 		"Os":         runtime.GOOS,
 		"Arch":       runtime.GOARCH,
 		"Sp3":        "   ",

globals.go

@@ -7,13 +7,14 @@ import (
 	"path/filepath"
 )
 
-const (
-	version = "0.2"
-)
-
 var (
 	programName string
 	errlog      *log.Logger
+
+	// The two variables below are set at build time for official releases
+	// (see Makefile)
+	version   = "unknown"
+	buildTime = "unknown"
 )
 
 func init() {