From a20109a8ee7c887c185959314dbd7da82ff36a6e Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Tue, 5 Nov 2013 23:53:39 +0000
Subject: [PATCH] Fixed version files (*.in)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/util/rsversion.in     |  6 ++-
 retroshare-gui/src/svn_revision.bat     |  2 +-
 retroshare-gui/src/util/rsguiversion.in | 68 ++++++++++++-------------
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/libretroshare/src/util/rsversion.in b/libretroshare/src/util/rsversion.in
index 91d447b7b..7e2f7cab1 100644
--- a/libretroshare/src/util/rsversion.in
+++ b/libretroshare/src/util/rsversion.in
@@ -6,13 +6,17 @@
  */
 
 #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 LIB_VERSION "0.5.5b"
 #define SVN_REVISION "Revision $WCREV$"
 #define SVN_REVISION_NUMBER  $WCREV$
 
 namespace RsUtil {
 
+	uint32_t retroshareRevision();
 	std::string retroshareVersion();
 
 }
diff --git a/retroshare-gui/src/svn_revision.bat b/retroshare-gui/src/svn_revision.bat
index d828ece90..c32e950fc 100644
--- a/retroshare-gui/src/svn_revision.bat
+++ b/retroshare-gui/src/svn_revision.bat
@@ -1,2 +1,2 @@
 @echo off
-"D:\Programme\TortoiseSVN\bin\SubWCRev" . util\rsversion.in util\rsversion.h 
\ No newline at end of file
+"D:\Programme\TortoiseSVN\bin\SubWCRev" . util\rsguiversion.in util\rsguiversion.cpp
\ No newline at end of file
diff --git a/retroshare-gui/src/util/rsguiversion.in b/retroshare-gui/src/util/rsguiversion.in
index 8fa160be0..7f64a9647 100644
--- a/retroshare-gui/src/util/rsguiversion.in
+++ b/retroshare-gui/src/util/rsguiversion.in
@@ -1,34 +1,34 @@
-/****************************************************************
- *  RetroShare is distributed under the following license:
- *
- *  Copyright (C) 2006,2007  crypton
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- *  Boston, MA  02110-1301, USA.
- ****************************************************************/
-
-
-#define GUI_VERSION "0.5.5b"
-
-#define GUI_REVISION "Revision: $WCREV$"
-
-
-#include <QString>
-
-QString retroshareVersion();
-
-QString retroshareRevision();
-
-
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2006,2007  crypton
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#include "rsguiversion.h"
+
+
+#define GUI_VERSION "0.5.5b"
+#define GUI_REVISION "Revision: $WCREV$"
+
+QString retroshareVersion() {
+	return QString(GUI_VERSION);
+}
+
+QString retroshareRevision() {
+	return QString(GUI_REVISION);
+}