Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 15:57:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved file rsversion.h to rsguiversion.h, since it caused a conflict with libretroshare/src/util/rsversion.h when included as util/rsversion.h. Updated version detail script.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5539 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-09-12 13:11:04 +00:00
parent 29b5983e71
commit 1581f5a96e
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -89,7 +89,7 @@
#include <retroshare/rsnotify.h> #include <retroshare/rsnotify.h>
#include "gui/connect/ConnectFriendWizard.h" #include "gui/connect/ConnectFriendWizard.h"
#include "util/rsversion.h" #include "util/rsguiversion.h"
#include "settings/rsettingswin.h" #include "settings/rsettingswin.h"
#include "settings/rsharesettings.h" #include "settings/rsharesettings.h"
#include "common/StatusDefs.h" #include "common/StatusDefs.h"

4
retroshare-gui/src/retroshare-gui.pro
View File

@ -283,7 +283,7 @@ HEADERS += rshare.h \
util/EventFilter.h \ util/EventFilter.h \
util/EventReceiver.h \ util/EventReceiver.h \
util/Widget.h \ util/Widget.h \
util/rsversion.h \ util/rsguiversion.h \
util/RsAction.h \ util/RsAction.h \
util/printpreview.h \ util/printpreview.h \
util/log.h \ util/log.h \
@ -576,7 +576,7 @@ SOURCES += main.cpp \
util/EventReceiver.cpp \ util/EventReceiver.cpp \
util/Widget.cpp \ util/Widget.cpp \
util/RsAction.cpp \ util/RsAction.cpp \
util/rsversion.cpp \ util/rsguiversion.cpp \
util/printpreview.cpp \ util/printpreview.cpp \
util/log.cpp \ util/log.cpp \
util/misc.cpp \ util/misc.cpp \

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

@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "rsversion.h" #include "rsguiversion.h"
QString retroshareVersion() { QString retroshareVersion() {
return QString(GUI_VERSION); return QString(GUI_VERSION);
@ -27,4 +27,4 @@ QString retroshareVersion() {
QString retroshareRevision() { QString retroshareRevision() {
return QString(GUI_REVISION); return QString(GUI_REVISION);
} }

0
retroshare-gui/src/util/rsversion.h → retroshare-gui/src/util/rsguiversion.h
View File

0
retroshare-gui/src/util/rsversion.in → retroshare-gui/src/util/rsguiversion.in
View File

6
retroshare-gui/src/version_detail.sh
View File

@ -27,7 +27,7 @@ if (ls &> /dev/null); then
echo "" >> gui/help/version.html echo "" >> gui/help/version.html
fi fi
#write the rsversion.h file #write the rsguiversion.h file
if ( git log -n 1 &> /dev/null); then if ( git log -n 1 &> /dev/null); then
#retrieve git information #retrieve git information
version="git : $(git status | grep branch | cut -c 6-) $(git log -n 1 | grep commit)" version="git : $(git status | grep branch | cut -c 6-) $(git log -n 1 | grep commit)"
@ -46,8 +46,8 @@ if ( svn info &> /dev/null); then
fi fi
if [[ $version != '' ]]; then if [[ $version != '' ]]; then
version="$version date : $(date +'%T %m.%d.%y')" version="$version date : $(date +'%T %m.%d.%y')"
echo "Writing version to util/rsversion.h : $version " echo "Writing version to util/rsguiversion.h : $version "
sed -i "s/GUI_REVISION .*/GUI_REVISION \"$version\"/g" util/rsversion.h sed -i "s/GUI_REVISION .*/GUI_REVISION \"$version\"/g" util/rsguiversion.h
fi fi
echo "version_detail.sh scripts finished" echo "version_detail.sh scripts finished"
exit 0 exit 0