From e7f3df7233a9909cf9260073c2ecee6716e67e77 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 18 Mar 2011 14:23:56 -0700
Subject: [PATCH] use 'git describe' version

---
 src/ceph_ver.c          | 2 +-
 src/check_version       | 4 ++--
 src/common/BackTrace.cc | 2 +-
 src/common/version.cc   | 4 ++--
 src/make_version        | 4 +++-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ceph_ver.c b/src/ceph_ver.c
index e1be389da2e1c..b983b5527015d 100644
--- a/src/ceph_ver.c
+++ b/src/ceph_ver.c
@@ -8,5 +8,5 @@
 
 DEFINE_VER_SYMBOL(CEPH_GIT_VER);
 
-#define CEPH_VER VERSION "-" #CEPH_GIT_VER
+
 
diff --git a/src/check_version b/src/check_version
index 0c9c1b0ac122d..86e6ba03e0176 100755
--- a/src/check_version
+++ b/src/check_version
@@ -6,12 +6,12 @@ if [ ! -d ../.git ]; then
 fi
 
 dname=`dirname $0`
-cur=`git rev-parse HEAD 2>/dev/null`
+cur=`git rev-parse HEAD 2>/dev/null; git describe 2>/dev/null`
 [ -e $1 ] && old=`cat $1`
 
 if [ "$cur" != "$old" ]; then
     echo regenerating $1 with $cur
-    echo $cur > $1
+    echo "$cur" > $1
 else
     echo $1 is up to date.
 fi
diff --git a/src/common/BackTrace.cc b/src/common/BackTrace.cc
index b68f40c2d7b93..8dfed2ed6ea99 100644
--- a/src/common/BackTrace.cc
+++ b/src/common/BackTrace.cc
@@ -16,7 +16,7 @@ namespace ceph {
 
 void BackTrace::print(std::ostream& out)
 {
-  out << " ceph version " << VERSION << " (commit:" << STRINGIFY(CEPH_GIT_VER) << ")" << std::endl;
+  out << " ceph version " << CEPH_GIT_NICE_VER << " (commit:" << STRINGIFY(CEPH_GIT_VER) << ")" << std::endl;
   for (size_t i = skip; i < size; i++) {
     //      out << " " << (i-skip+1) << ": " << strings[i] << std::endl;
 
diff --git a/src/common/version.cc b/src/common/version.cc
index fb27d8998719d..c51dfd8a22414 100644
--- a/src/common/version.cc
+++ b/src/common/version.cc
@@ -24,7 +24,7 @@
 
 const char *ceph_version_to_str(void)
 {
-  return VERSION;
+  return CEPH_GIT_NICE_VER;
 }
 
 const char *git_version_to_str(void)
@@ -35,7 +35,7 @@ const char *git_version_to_str(void)
 std::string const pretty_version_to_str(void)
 {
   std::ostringstream oss;
-  oss << "ceph version " << VERSION << " (commit:"
+  oss << "ceph version " << CEPH_GIT_NICE_VER << " (commit:"
       << STRINGIFY(CEPH_GIT_VER) << ")";
   return oss.str();
 }
diff --git a/src/make_version b/src/make_version
index 8fc19656b7a74..9a432802d1ddd 100755
--- a/src/make_version
+++ b/src/make_version
@@ -1,12 +1,14 @@
 #!/bin/bash
 
-cur=`cat $1`
+cur=`head -1 $1`
+v=`tail -1 $1 | cut -c 2-`
 
 print_all() {
 	echo "#ifndef CEPH_VERSION_H"
 	echo "#define CEPH_VERSION_H"
 	echo
 	echo "#define CEPH_GIT_VER $cur"
+	echo "#define CEPH_GIT_NICE_VER \"$v\""
 	echo
 	echo "#endif"
 }
-- 
2.39.5