From 9156530dac31977c6dd70c4cf8481034ad2df266 Mon Sep 17 00:00:00 2001
From: Zhipeng Xie <xiezhipeng1@huawei.com>
Date: Tue, 21 Jan 2020 03:42:20 -0500
Subject: [PATCH] unify version and add source git version

Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
---
 Makefile                | 10 ++++++++--
 common/config/config.go |  4 ++--
 misc/atune.spec         |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index c4e8dbc..59519df 100755
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+VERSION = 0.1
 .PHONY: all clean modules
 
 PKGPATH=pkg
@@ -6,14 +7,19 @@ PREFIX    ?= /usr
 LIBEXEC   ?= libexec
 BINDIR     = $(DESTDIR)$(PREFIX)/bin
 SYSTEMDDIR = $(DESTDIR)$(PREFIX)/lib/systemd/system
+SRCVERSION = $(shell git rev-parse --short HEAD 2>/dev/null)
+ATUNEVERSION = $(VERSION)$(if $(SRCVERSION),($(SRCVERSION)))
+
+GOLDFLAGS += -X atune/common/config.Version=$(ATUNEVERSION)
+GOFLAGS = -ldflags "$(GOLDFLAGS)"
 
 all: modules atune-adm atuned db
 
 atune-adm:
-	export GOPATH=`cd ../../;pwd` && go build -v -o $(PKGPATH)/atune-adm cmd/atune-adm/*.go
+	export GOPATH=`cd ../../;pwd` && go build -v $(GOFLAGS) -o $(PKGPATH)/atune-adm cmd/atune-adm/*.go
 
 atuned:
-	export GOPATH=`cd ../../;pwd` && go build -v -o $(PKGPATH)/atuned cmd/atuned/*.go
+	export GOPATH=`cd ../../;pwd` && go build -v $(GOFLAGS) -o $(PKGPATH)/atuned cmd/atuned/*.go
 
 modules:
 	export GOPATH=`cd ../../;pwd` && cd ${CURDIR}/modules/server/profile/ && go build -buildmode=plugin -o ${CURDIR}/pkg/daemon_profile_server.so *.go
diff --git a/common/config/config.go b/common/config/config.go
index f72a4f3..ce14fde 100644
--- a/common/config/config.go
+++ b/common/config/config.go
@@ -24,10 +24,10 @@ import (
 	"github.com/go-ini/ini"
 )
 
+var Version = "no version specified"
+
 // application common config
 const (
-	Version = "0.0.1"
-
 	EnvAddr    = "ATUNED_ADDR"
 	EnvPort    = "ATUNED_PORT"
 	EnvTLS     = "ATUNE_TLS"
diff --git a/misc/atune.spec b/misc/atune.spec
index 1b32732..3f4c66f 100755
--- a/misc/atune.spec
+++ b/misc/atune.spec
@@ -2,7 +2,7 @@
 
 Summary: AI auto tuning system
 Name: atune
-Version: 1.0
+Version: 0.1
 Release: 0.1%{?dist}
 License: Mulan PSL v1
 Source: %{name}-%{version}.tar.gz
@@ -104,5 +104,5 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version}
 %systemd_postun_with_restart atuned.service
 
 %changelog
-* Tue Nov 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.0-0.1
+* Tue Nov 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.1-0.1
 - Package init
-- 
GitLab