Cleaned up GXS compilation. now single config option (gxs) in .pro file.

Removed GXS headers from p3face.h and used class declarations.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5991 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/libretroshare.pro

@@ -9,8 +9,8 @@ TARGET = retroshare
 CONFIG += test_voip
 
 # GXS Stuff.
-CONFIG += newcache
+# this should be disabled for releases until further notice.
-CONFIG += newservices
+#CONFIG += gxs
 
 # Beware: All data of the stripped services are lost
 DEFINES *= PQI_DISABLE_TUNNEL
@@ -595,7 +595,10 @@ HEADERS += retroshare/rsgame.h
         }
         
         # new gxs cache system
-        newcache {
+        # this should be disabled for releases until further notice.
+        gxs {
+            DEFINES *= RS_ENABLE_GXS
+
             HEADERS += serialiser/rsnxsitems.h \
                 gxs/rsgds.h \
                 gxs/rsgxs.h \
@@ -689,9 +692,3 @@ HEADERS += retroshare/rsgame.h
                 serialiser/rsphotoitems.cc \
         }
 
-        newservices { 
-		# source code for p3gxsserviceVEG / p3postedVEG will be maintained
-		# until they are finished - for reference... but it wont compile.	
-
-        }
-

libretroshare/src/rsserver/p3face-config.cc

@@ -42,6 +42,19 @@ const int p3facemsgzone = 11453;
 #include "pqi/p3netmgr.h"
 
 
+// TO SHUTDOWN THREADS.
+#ifdef RS_ENABLE_GXS
+
+#include "services/p3idservice.h"
+#include "services/p3gxscircles.h"
+#include "services/p3wiki.h"
+#include "services/p3posted.h"
+#include "services/p3photoservice.h"
+#include "services/p3gxsforums.h"
+#include "services/p3wire.h"
+
+#endif
+
 /****************************************/
 /* RsIface Config */
 /* Config */
@@ -190,6 +203,9 @@ void RsServer::rsGlobalShutDown()
 	mForums->join();
 	mChannels->join();
 
+
+
+#ifdef RS_ENABLE_GXS
         if(mGxsCircles) mGxsCircles->join();
         if(mGxsForums) mGxsForums->join();
         if(mGxsIdService) mGxsIdService->join();
@@ -197,6 +213,7 @@ void RsServer::rsGlobalShutDown()
         if(mPhoto) mPhoto->join();
         if(mWiki) mWiki->join();
         if(mWire) mWire->join();
+#endif
 
 
 

libretroshare/src/rsserver/p3face-server.cc

@@ -77,7 +77,9 @@ RsServer::RsServer(RsIface &i, NotifyBase &callback)
 	mConfigMgr = NULL;
 	mGeneralConfig = NULL;
 
-        /* GXS */
+        /* GXS - Amazingly we can still initialise these
+         * even without knowing the data-types (they are just pointers???)
+	 */
         mPhoto = NULL;
         mWiki = NULL;
         mPosted = NULL;
@@ -85,6 +87,7 @@ RsServer::RsServer(RsIface &i, NotifyBase &callback)
         mGxsIdService = NULL;
         mGxsForums = NULL;
         mWire = NULL;
+
 }
 
 RsServer::~RsServer()

libretroshare/src/rsserver/p3face.h

@@ -45,13 +45,16 @@
 #include "services/p3channels.h"
 #include "services/p3forums.h"
 
-#include "services/p3idservice.h"
+/* GXS Classes - just declare the classes.
-#include "services/p3gxscircles.h"
+   so we don't have to totally recompile to switch */
-#include "services/p3wiki.h"
+
-#include "services/p3posted.h"
+class p3IdService;
-#include "services/p3photoservice.h"
+class p3GxsCircles;
-#include "services/p3gxsforums.h"
+class p3GxsForums;
-#include "services/p3wire.h"
+class p3Wiki;
+class p3Posted;
+class p3PhotoService;
+class p3Wire;
 
 
 class p3PeerMgrIMPL;
@@ -185,7 +188,6 @@ class RsServer: public RsControl, public RsThread
 		/* caches (that need ticking) */
 
                 /* GXS */
-
                 p3Wiki *mWiki;
                 p3Posted *mPosted;
                 p3PhotoService *mPhoto;

libretroshare/src/rsserver/rsinit.cc

@@ -1812,17 +1812,22 @@ RsTurtle *rsTurtle = NULL ;
 #include "services/p3blogs.h"
 #include "turtle/p3turtle.h"
 
-#define ENABLE_GXS_SERVICES	1
+#ifdef RS_ENABLE_GXS
-#define ENABLE_GXS_CORE 1
+// NEW GXS SYSTEMS.
-#define ENABLE_OTHER_GXS_SERVICES 1 // DISABLE TO LEAVE ONLY GXSID (for testing)
-
-#ifdef ENABLE_GXS_CORE
 #include "gxs/gxscoreserver.h"
 #include "gxs/rsdataservice.h"
 #include "gxs/rsgxsnetservice.h"
 #include "gxs/rsgxsflags.h"
-#endif
 
+#include "services/p3idservice.h"
+#include "services/p3gxscircles.h"
+#include "services/p3wiki.h"
+#include "services/p3posted.h"
+#include "services/p3photoservice.h"
+#include "services/p3gxsforums.h"
+#include "services/p3wire.h"
+
+#endif // RS_ENABLE_GXS
 
 #ifndef PQI_DISABLE_TUNNEL
 #include "services/p3tunnel.h"
@@ -2265,7 +2270,7 @@ int RsServer::StartupRetroShare()
 	mPluginsManager->registerCacheServices() ;
 
 
-#ifdef ENABLE_GXS_SERVICES
+#ifdef RS_ENABLE_GXS
 
         // The idea is that if priorGxsDir is non
         // empty and matches an exist directory location
@@ -2321,9 +2326,7 @@ int RsServer::StartupRetroShare()
                         RS_SERVICE_GXSV1_TYPE_GXSCIRCLE, gxscircles_ds, nxsMgr, mGxsCircles);
 
 
-#if ENABLE_OTHER_GXS_SERVICES
         /**** Photo service ****/
-
         // create photo authentication policy
         uint32_t photoAuthenPolicy = 0;
 
@@ -2415,14 +2418,9 @@ int RsServer::StartupRetroShare()
         // create GXS photo service
         RsGxsNetService* gxsforums_ns = new RsGxsNetService(
                         RS_SERVICE_GXSV1_TYPE_FORUMS, gxsforums_ds, nxsMgr, mGxsForums);
-#endif
 
-#endif // ENABLE_GXS_SERVICES
-
-#ifdef ENABLE_GXS_CORE
 
         /*** start up GXS core runner ***/
-#if ENABLE_OTHER_GXS_SERVICES
         createThread(*mGxsIdService);
         createThread(*mGxsCircles);
         createThread(*mPhoto);
@@ -2430,30 +2428,25 @@ int RsServer::StartupRetroShare()
         createThread(*mWiki);
         createThread(*mWire);
         createThread(*mGxsForums);
-#endif
 
         // cores ready start up GXS net servers
         createThread(*gxsid_ns);
         createThread(*gxscircles_ns);
-#if ENABLE_OTHER_GXS_SERVICES
         createThread(*photo_ns);
         createThread(*posted_ns);
         createThread(*wiki_ns);
         createThread(*wire_ns);
         createThread(*gxsforums_ns);
-#endif
 
         // now add to p3service
         pqih->addService(gxsid_ns);
         pqih->addService(gxscircles_ns);
-#if ENABLE_OTHER_GXS_SERVICES
         pqih->addService(photo_ns);
         pqih->addService(posted_ns);
         pqih->addService(wiki_ns);
         pqih->addService(gxsforums_ns);
-#endif
 
-#endif
+#endif // RS_ENABLE_GXS.
 
 
 #ifndef RS_RELEASE
@@ -2712,21 +2705,17 @@ int RsServer::StartupRetroShare()
 	rsForums = mForums;
 	rsChannels = mChannels;
 
-#ifdef ENABLE_GXS_SERVICES
+#ifdef RS_ENABLE_GXS
-        // Testing of new cache system interfaces.
 
 	rsIdentity = mGxsIdService;
 	rsGxsCircles = mGxsCircles;
-#if ENABLE_OTHER_GXS_SERVICES
         rsWiki = mWiki;
         rsPosted = mPosted;
         rsPhoto = mPhoto;
         rsGxsForums = mGxsForums;
         rsWire = mWire;
-#endif
 
-
+#endif // RS_ENABLE_GXS
-#endif // ENABLE_GXS_SERVICES
 
 
 #ifdef RS_USE_BLOGS