Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 22:25:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed version files from retroshare-gui.

Browse source 
Moved header file with version information to retroshare/rsversion.h.
Added version information to Windows executable.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-01-14 23:26:51 +00:00
parent 4e8cc9d49f
commit 94ec83fcdb
27 changed files with 156 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/libretroshare.pro
View file

@ -105,6 +105,7 @@ PUBLIC_HEADERS = retroshare/rsdisc.h \
retroshare/rsdht.h \
retroshare/rsrtt.h \
retroshare/rsconfig.h \
retroshare/rsversion.h \
retroshare/rsservicecontrol.h \
@ -451,7 +452,7 @@ HEADERS += util/folderiterator.h \
util/rsprint.h \
util/rsstring.h \
util/rsthreads.h \
util/rsversion.h \
util/rsversioninfo.h \
util/rswin.h \
util/rsrandom.h \
util/radix64.h \
@ -603,7 +604,7 @@ SOURCES += util/folderiterator.cc \
util/rsprint.cc \
util/rsstring.cc \
util/rsthreads.cc \
util/rsversion.cc \
util/rsversioninfo.cc \
util/rswin.cc \
util/rsaes.cc \
util/rsrandom.cc \

1
libretroshare/src/plugins/pluginmanager.cc
View file

@ -14,6 +14,7 @@
#include <rsserver/p3face.h>
#include <util/rsdir.h>
#include <util/rsversioninfo.h>
#include <util/folderiterator.h>
#include <ft/ftserver.h>
#include <dbase/cachestrapper.h>

6
libretroshare/src/retroshare/rsplugin.h
View file

@ -32,7 +32,7 @@
#include <vector>
#include "retroshare/rspeers.h"
#include "retroshare/rsfiles.h"
#include "util/rsversion.h"
#include "retroshare/rsversion.h"
#include "util/rsinitedptr.h"
class RsPluginHandler ;
@ -184,11 +184,11 @@ class RsPlugin
//
// 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 RS_REVISION_NUMBER ; } // This is read from libretroshare/retroshare/rsversion.h
virtual std::string getShortPluginDescription() const = 0 ;
virtual std::string getPluginName() const = 0 ;
virtual void getPluginVersion(int& major,int& minor,int& svn_rev) const = 0 ;
virtual void getPluginVersion(int& major,int& minor, int& build, int& svn_rev) const = 0 ;
//
//========================== Plugin Interface ================================//

5
libretroshare/src/retroshare/rsversion.h Normal file
View file

@ -0,0 +1,5 @@
#define RS_MAJOR_VERSION 0
#define RS_MINOR_VERSION 6
#define RS_BUILD_NUMBER 0
#define RS_BUILD_NUMBER_ADD "x" // <-- do we need this?
#define RS_REVISION_NUMBER 7843

5
libretroshare/src/retroshare/rsversion.in Normal file
View file

@ -0,0 +1,5 @@
#define RS_MAJOR_VERSION 0
#define RS_MINOR_VERSION 6
#define RS_BUILD_NUMBER 0
#define RS_BUILD_NUMBER_ADD "x" // <-- do we need this?
#define RS_REVISION_NUMBER $WCREV$

2
libretroshare/src/services/p3discovery2.cc
View file

@ -24,7 +24,7 @@
*/
#include "services/p3discovery2.h"
#include "util/rsversion.h"
#include "util/rsversioninfo.h"
#include "retroshare/rsiface.h"
#include "rsserver/p3face.h"

22
libretroshare/src/util/rsversion.cc
View file

@ -1,22 +0,0 @@
/*
* rsversion.cc
*
* Created on: Jun 23, 2009
* Author: alexandrut
*/
#include "rsversion.h"
#define LIB_VERSION "0.6.0"
std::string RsUtil::retroshareVersion()
{
return std::string(LIB_VERSION) + " " + std::string(SVN_REVISION);
}
uint32_t RsUtil::retroshareRevision()
{
return SVN_REVISION_NUMBER;
}

22
libretroshare/src/util/rsversion.h
View file

@ -1,22 +0,0 @@
/*
* rsversion.h
*
* Created on: Jun 23, 2009
* Author: alexandrut
*/
#include <string>
#include <inttypes.h>
// These versioning parameters are in the header because plugin versioning requires it.
// Please use the functions below, and don't refer directly to the #defines.
#define SVN_REVISION "Revision 7106"
#define SVN_REVISION_NUMBER 7106
namespace RsUtil {
uint32_t retroshareRevision();
std::string retroshareVersion();
}

22
libretroshare/src/util/rsversion.in
View file

@ -1,22 +0,0 @@
/*
* rsversion.h
*
* Created on: Jun 23, 2009
* Author: alexandrut
*/
#include <string>
#include <inttypes.h>
// These versioning parameters are in the header because plugin versioning requires it.
// Please use the functions below, and don't refer directly to the #defines.
#define SVN_REVISION "Revision $WCREV$"
#define SVN_REVISION_NUMBER $WCREV$
namespace RsUtil {
uint32_t retroshareRevision();
std::string retroshareVersion();
}

23
libretroshare/src/util/rsversioninfo.cc Normal file
View file

@ -0,0 +1,23 @@
/*
* rsversion.cc
*
* Created on: Jun 23, 2009
* Author: alexandrut
*/
#include "rsversioninfo.h"
#include "retroshare/rsversion.h"
#include "rsstring.h"
std::string RsUtil::retroshareVersion()
{
std::string version;
rs_sprintf(version, "%d.%d.%d%s Revision %d", RS_MAJOR_VERSION, RS_MINOR_VERSION, RS_BUILD_NUMBER, RS_BUILD_NUMBER_ADD, RS_REVISION_NUMBER);
return version;
}
uint32_t RsUtil::retroshareRevision()
{
return RS_REVISION_NUMBER;
}

16
libretroshare/src/util/rsversioninfo.h Normal file
View file

@ -0,0 +1,16 @@
/*
* rsversion.h
*
* Created on: Jun 23, 2009
* Author: alexandrut
*/
#include <string>
#include <inttypes.h>
namespace RsUtil {
uint32_t retroshareRevision();
std::string retroshareVersion();
}