From e5cd91764596638d90eaf2246f5076930b21a28c Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 16 Dec 2009 21:54:46 +0000 Subject: [PATCH] added SVN_REVISION to rsversion to not overwrite LIB_VERSION git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1894 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/util/rsversion.cc | 3 ++- libretroshare/src/util/rsversion.h | 7 ++++++- libretroshare/src/version_detail.sh | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/util/rsversion.cc b/libretroshare/src/util/rsversion.cc index 1c72f07cd..68241313c 100644 --- a/libretroshare/src/util/rsversion.cc +++ b/libretroshare/src/util/rsversion.cc @@ -9,5 +9,6 @@ std::string RsUtil::retroshareVersion() { - return std::string(LIB_VERSION); + return std::string(LIB_VERSION) + " " + std::string(SVN_REVISION); + } diff --git a/libretroshare/src/util/rsversion.h b/libretroshare/src/util/rsversion.h index e1f9a370a..37c58351a 100644 --- a/libretroshare/src/util/rsversion.h +++ b/libretroshare/src/util/rsversion.h @@ -7,10 +7,15 @@ #include -#define LIB_VERSION "0.5.x" +#define LIB_VERSION "0.5.0" +#define SVN_REVISION "" namespace RsUtil { std::string retroshareVersion(); } + + + + diff --git a/libretroshare/src/version_detail.sh b/libretroshare/src/version_detail.sh index 3a3da64b7..03da58d67 100755 --- a/libretroshare/src/version_detail.sh +++ b/libretroshare/src/version_detail.sh @@ -23,7 +23,7 @@ fi if [[ $version != '' ]]; then version="$version date : $(date +'%T %m.%d.%y')" echo "Writing version to util/rsversion.h : $version " - sed -i "s/LIB_VERSION .*/LIB_VERSION \"$version\"/g" util/rsversion.h + sed -i "s/SVN_REVISION .*/SVN_REVISION \"$version\"/g" util/rsversion.h fi echo "script version_detail.sh finished normally" exit 0