Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated SVN revision number for v0.5.5b.

Browse Source 
Moved #defines to code files for better encapsulation.
Removed other references to #defines.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-10-25 00:42:49 +00:00
parent 0ad20e6911
commit bd0b1a5ac5
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/plugins/pluginmanager.cc
View File

@ -306,7 +306,7 @@ bool RsPluginManager::loadPlugin(const std::string& plugin_name)
std::cerr << " -> plugin revision number: " << pinfo.svn_revision << std::endl; std::cerr << " -> plugin revision number: " << pinfo.svn_revision << std::endl;
std::cerr << " plugin API number : " << std::hex << pinfo.API_version << std::dec << std::endl; std::cerr << " plugin API number : " << std::hex << pinfo.API_version << std::dec << std::endl;
std::cerr << " retroshare svn number: " << SVN_REVISION_NUMBER << std::endl; std::cerr << " retroshare svn number: " << RsUtil::retroshareRevision() << std::endl;
// Check that the plugin provides a svn revision number and a API number // Check that the plugin provides a svn revision number and a API number
// //

2
libretroshare/src/retroshare/rsplugin.h
View File

@ -148,7 +148,7 @@ class RsPlugin
// //
// All these items appear in the config->plugins tab, as a description of the plugin. // All these items appear in the config->plugins tab, as a description of the plugin.
// //
uint32_t getSvnRevision() const { return SVN_REVISION_NUMBER ; } // This is read from libretroshare/util/rsversion.h uint32_t getSvnRevision() const { return RsUtil::retroshareRevision(); } // This is read from libretroshare/util/rsversion.h
virtual std::string getShortPluginDescription() const = 0 ; virtual std::string getShortPluginDescription() const = 0 ;
virtual std::string getPluginName() const = 0 ; virtual std::string getPluginName() const = 0 ;

10
libretroshare/src/util/rsversion.cc
View File

@ -7,8 +7,18 @@
#include "rsversion.h" #include "rsversion.h"
#define LIB_VERSION "0.5.5b"
#define SVN_REVISION "Revision 6877"
#define SVN_REVISION_NUMBER 6877
std::string RsUtil::retroshareVersion() std::string RsUtil::retroshareVersion()
{ {
return std::string(LIB_VERSION) + " " + std::string(SVN_REVISION); return std::string(LIB_VERSION) + " " + std::string(SVN_REVISION);
} }
uint32_t RsUtil::retroshareRevision()
{
return SVN_REVISION_NUMBER;
}

6
libretroshare/src/util/rsversion.h
View File

@ -6,13 +6,11 @@
*/ */
#include <string> #include <string>
#include <inttypes.h>
#define LIB_VERSION "0.5.5b"
#define SVN_REVISION "Revision 6722"
#define SVN_REVISION_NUMBER 6722
namespace RsUtil { namespace RsUtil {
uint32_t retroshareRevision();
std::string retroshareVersion(); std::string retroshareVersion();
} }

4
retroshare-gui/src/util/rsguiversion.cpp
View File

@ -21,6 +21,10 @@
#include "rsguiversion.h" #include "rsguiversion.h"
#define GUI_VERSION "0.5.5b"
#define GUI_REVISION "Revision: 6877"
QString retroshareVersion() { QString retroshareVersion() {
return QString(GUI_VERSION); return QString(GUI_VERSION);
} }

6
retroshare-gui/src/util/rsguiversion.h
View File

@ -19,12 +19,6 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#define GUI_VERSION "0.5.5b"
#define GUI_REVISION "Revision: 6722"
#include <QString> #include <QString>
QString retroshareVersion(); QString retroshareVersion();