use 'git describe' version

diff --git a/src/ceph_ver.c b/src/ceph_ver.c
index e1be389da2e1c7dc5f6a976d697d955d15ca539a..b983b5527015d3e043c9c9d3c7a92fd127414797 100644 (file)
--- 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 0c9c1b0ac122d813efbd73534e381348406b836f..86e6ba03e0176040e4aa7e65006d0ee21d2a72b1 100755 (executable)
--- 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 b68f40c2d7b93d4d989550fa0235c1f54c068f41..8dfed2ed6ea998032dedc60e16e06f82edad7617 100644 (file)
--- 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 fb27d8998719d3877d50828a9e484bd3ed00ab11..c51dfd8a224146cdb5d89c57b0381b2300b74153 100644 (file)
--- 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 8fc19656b7a74c9c3e59fa709774c1c72cb5fd1c..9a432802d1dddee80f9e8c6a8ce89822888f2719 100755 (executable)
--- 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"
 }