Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Limber/SConscript25
-rw-r--r--Limber/Server/ServerFromClientSession.cpp (renamed from Swiften/Server/ServerFromClientSession.cpp)4
-rw-r--r--Limber/Server/ServerFromClientSession.h (renamed from Swiften/Server/ServerFromClientSession.h)0
-rw-r--r--Limber/Server/ServerSession.cpp (renamed from Swiften/Server/ServerSession.cpp)2
-rw-r--r--Limber/Server/ServerSession.h (renamed from Swiften/Server/ServerSession.h)0
-rw-r--r--Limber/Server/ServerStanzaRouter.cpp (renamed from Swiften/Server/ServerStanzaRouter.cpp)4
-rw-r--r--Limber/Server/ServerStanzaRouter.h (renamed from Swiften/Server/ServerStanzaRouter.h)0
-rw-r--r--Limber/Server/SimpleUserRegistry.cpp (renamed from Swiften/Server/SimpleUserRegistry.cpp)2
-rw-r--r--Limber/Server/SimpleUserRegistry.h (renamed from Swiften/Server/SimpleUserRegistry.h)2
-rw-r--r--Limber/Server/UnitTest/ServerStanzaRouterTest.cpp (renamed from Swiften/Server/UnitTest/ServerStanzaRouterTest.cpp)4
-rw-r--r--Limber/Server/UserRegistry.cpp (renamed from Swiften/Server/UserRegistry.cpp)2
-rw-r--r--Limber/Server/UserRegistry.h (renamed from Swiften/Server/UserRegistry.h)0
-rw-r--r--Limber/main.cpp4
-rw-r--r--QA/UnitTest/SConscript1
-rw-r--r--Slimber/CLI/SConscript1
-rw-r--r--Slimber/Cocoa/SConscript1
-rw-r--r--Slimber/SConscript1
-rw-r--r--Slimber/Server.cpp4
-rw-r--r--Slimber/Server.h4
-rw-r--r--Swiften/SConscript5
20 files changed, 43 insertions, 23 deletions
diff --git a/Limber/SConscript b/Limber/SConscript
index e2fadac..bc05f7f 100644
--- a/Limber/SConscript
+++ b/Limber/SConscript
@@ -1,14 +1,35 @@
Import("env")
-if env["SCONS_STAGE"] == "build" :
+if env["SCONS_STAGE"] == "flags" :
+ env["LIMBER_FLAGS"] = {
+ "LIBPATH": [Dir(".")],
+ "LIBS": ["Limber"],
+ }
+
+elif env["SCONS_STAGE"] == "build" :
+ libenv = env.Clone()
+ libenv.MergeFlags(env["BOOST_FLAGS"])
+ libenv.MergeFlags(env["SWIFTEN_FLAGS"])
+ libenv.StaticLibrary("Limber", [
+ "Server/ServerFromClientSession.cpp",
+ "Server/ServerSession.cpp",
+ "Server/ServerStanzaRouter.cpp",
+ "Server/SimpleUserRegistry.cpp",
+ "Server/UserRegistry.cpp",
+ ])
+
myenv = env.Clone()
myenv.BuildVersion("BuildVersion.h", project = "limber")
+ myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.UseFlags(env["SWIFTEN_FLAGS"])
myenv.UseFlags(env["LIBIDN_FLAGS"])
myenv.UseFlags(env.get("LIBXML_FLAGS", ""))
myenv.UseFlags(env.get("EXPAT_FLAGS", ""))
myenv.UseFlags(env["OPENSSL_FLAGS"])
myenv.UseFlags(env["BOOST_FLAGS"])
myenv.UseFlags(myenv["PLATFORM_FLAGS"])
-
myenv.Program("limber", ["main.cpp"])
+
+ env.Append(UNITTEST_SOURCES = [
+ File("Server/UnitTest/ServerStanzaRouterTest.cpp"),
+ ])
diff --git a/Swiften/Server/ServerFromClientSession.cpp b/Limber/Server/ServerFromClientSession.cpp
index 18da7e8..b51a53f 100644
--- a/Swiften/Server/ServerFromClientSession.cpp
+++ b/Limber/Server/ServerFromClientSession.cpp
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#include "Swiften/Server/ServerFromClientSession.h"
+#include "Limber/Server/ServerFromClientSession.h"
#include <boost/bind.hpp>
#include "Swiften/Elements/ProtocolHeader.h"
-#include "Swiften/Server/UserRegistry.h"
+#include "Limber/Server/UserRegistry.h"
#include "Swiften/Network/Connection.h"
#include "Swiften/StreamStack/XMPPLayer.h"
#include "Swiften/Elements/StreamFeatures.h"
#include "Swiften/Elements/ResourceBind.h"
#include "Swiften/Elements/StartSession.h"
#include "Swiften/Elements/IQ.h"
#include "Swiften/Elements/AuthSuccess.h"
#include "Swiften/Elements/AuthFailure.h"
#include "Swiften/Elements/AuthRequest.h"
diff --git a/Swiften/Server/ServerFromClientSession.h b/Limber/Server/ServerFromClientSession.h
index 80ef063..80ef063 100644
--- a/Swiften/Server/ServerFromClientSession.h
+++ b/Limber/Server/ServerFromClientSession.h
diff --git a/Swiften/Server/ServerSession.cpp b/Limber/Server/ServerSession.cpp
index 10d642d..5b6d66a 100644
--- a/Swiften/Server/ServerSession.cpp
+++ b/Limber/Server/ServerSession.cpp
@@ -1,14 +1,14 @@
/*
* Copyright (c) 2010 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#include "Swiften/Server/ServerSession.h"
+#include "Limber/Server/ServerSession.h"
namespace Swift {
ServerSession::~ServerSession() {
}
}
diff --git a/Swiften/Server/ServerSession.h b/Limber/Server/ServerSession.h
index bd4ab6d..bd4ab6d 100644
--- a/Swiften/Server/ServerSession.h
+++ b/Limber/Server/ServerSession.h
diff --git a/Swiften/Server/ServerStanzaRouter.cpp b/Limber/Server/ServerStanzaRouter.cpp
index b4d230a..fec529f 100644
--- a/Swiften/Server/ServerStanzaRouter.cpp
+++ b/Limber/Server/ServerStanzaRouter.cpp
@@ -1,17 +1,17 @@
/*
* Copyright (c) 2010 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#include "Swiften/Server/ServerStanzaRouter.h"
-#include "Swiften/Server/ServerSession.h"
+#include "Limber/Server/ServerStanzaRouter.h"
+#include "Limber/Server/ServerSession.h"
#include <cassert>
#include <algorithm>
namespace Swift {
namespace {
struct PriorityLessThan {
bool operator()(const ServerSession* s1, const ServerSession* s2) const {
diff --git a/Swiften/Server/ServerStanzaRouter.h b/Limber/Server/ServerStanzaRouter.h
index 2a1960c..2a1960c 100644
--- a/Swiften/Server/ServerStanzaRouter.h
+++ b/Limber/Server/ServerStanzaRouter.h
diff --git a/Swiften/Server/SimpleUserRegistry.cpp b/Limber/Server/SimpleUserRegistry.cpp
index 2de28fe..5b7329a 100644
--- a/Swiften/Server/SimpleUserRegistry.cpp
+++ b/Limber/Server/SimpleUserRegistry.cpp
@@ -1,16 +1,16 @@
/*
* Copyright (c) 2010 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#include "Swiften/Server/SimpleUserRegistry.h"
+#include "Limber/Server/SimpleUserRegistry.h"
namespace Swift {
SimpleUserRegistry::SimpleUserRegistry() {
}
bool SimpleUserRegistry::isValidUserPassword(const JID& user, const std::string& password) const {
std::map<JID,std::string>::const_iterator i = users.find(user);
return i != users.end() ? i->second == password : false;
diff --git a/Swiften/Server/SimpleUserRegistry.h b/Limber/Server/SimpleUserRegistry.h
index 5de9f64..677d006 100644
--- a/Swiften/Server/SimpleUserRegistry.h
+++ b/Limber/Server/SimpleUserRegistry.h
@@ -4,19 +4,19 @@
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#pragma once
#include <map>
#include "Swiften/JID/JID.h"
#include <string>
-#include "Swiften/Server/UserRegistry.h"
+#include "Limber/Server/UserRegistry.h"
namespace Swift {
class SimpleUserRegistry : public UserRegistry {
public:
SimpleUserRegistry();
virtual bool isValidUserPassword(const JID& user, const std::string& password) const;
diff --git a/Swiften/Server/UnitTest/ServerStanzaRouterTest.cpp b/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
index 0a5c7c1..87c713e 100644
--- a/Swiften/Server/UnitTest/ServerStanzaRouterTest.cpp
+++ b/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
@@ -2,20 +2,20 @@
* Copyright (c) 2010 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include "Swiften/Elements/Message.h"
-#include "Swiften/Server/ServerStanzaRouter.h"
-#include "Swiften/Server/ServerSession.h"
+#include "Limber/Server/ServerStanzaRouter.h"
+#include "Limber/Server/ServerSession.h"
using namespace Swift;
class ServerStanzaRouterTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(ServerStanzaRouterTest);
CPPUNIT_TEST(testRouteStanza_FullJID);
CPPUNIT_TEST(testRouteStanza_FullJIDWithNegativePriority);
CPPUNIT_TEST(testRouteStanza_FullJIDWithOnlyBareJIDMatchingSession);
CPPUNIT_TEST(testRouteStanza_BareJIDWithoutMatchingSession);
diff --git a/Swiften/Server/UserRegistry.cpp b/Limber/Server/UserRegistry.cpp
index 0795f16..5ac462a 100644
--- a/Swiften/Server/UserRegistry.cpp
+++ b/Limber/Server/UserRegistry.cpp
@@ -1,14 +1,14 @@
/*
* Copyright (c) 2010 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#include "Swiften/Server/UserRegistry.h"
+#include "Limber/Server/UserRegistry.h"
namespace Swift {
UserRegistry::~UserRegistry() {
}
}
diff --git a/Swiften/Server/UserRegistry.h b/Limber/Server/UserRegistry.h
index c021fc4..c021fc4 100644
--- a/Swiften/Server/UserRegistry.h
+++ b/Limber/Server/UserRegistry.h
diff --git a/Limber/main.cpp b/Limber/main.cpp
index 6db623e..e6bc45d 100644
--- a/Limber/main.cpp
+++ b/Limber/main.cpp
@@ -5,29 +5,29 @@
*/
#include <string>
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
#include "Swiften/Elements/IQ.h"
#include "Swiften/Elements/RosterPayload.h"
#include "Swiften/Elements/VCard.h"
-#include "Swiften/Server/SimpleUserRegistry.h"
#include "Swiften/Base/IDGenerator.h"
#include "Swiften/EventLoop/EventLoop.h"
#include "Swiften/EventLoop/SimpleEventLoop.h"
#include "Swiften/EventLoop/EventOwner.h"
#include "Swiften/Elements/Stanza.h"
#include "Swiften/Network/ConnectionServer.h"
#include "Swiften/Network/BoostConnection.h"
#include "Swiften/Network/BoostIOServiceThread.h"
#include "Swiften/Network/BoostConnectionServer.h"
-#include "Swiften/Server/ServerFromClientSession.h"
+#include "Limber/Server/SimpleUserRegistry.h"
+#include "Limber/Server/ServerFromClientSession.h"
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
using namespace Swift;
class Server {
public:
Server(UserRegistry* userRegistry, EventLoop* eventLoop) : userRegistry_(userRegistry) {
serverFromClientConnectionServer_ = BoostConnectionServer::create(5222, boostIOServiceThread_.getIOService(), eventLoop);
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index 25e9b05..76abbcb 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -6,18 +6,19 @@ if env["TEST"] :
if env["SCONS_STAGE"] == "flags" :
env["UNITTEST_SOURCES"] = []
env["UNITTEST_OBJECTS"] = []
if env["SCONS_STAGE"] == "test" :
myenv = env.Clone()
myenv.MergeFlags(env.get("CHECKER_FLAGS",""))
myenv.MergeFlags(env.get("SLIMBER_FLAGS",""))
myenv.MergeFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
myenv.MergeFlags(env.get("SWIFTOOLS_FLAGS",""))
+ myenv.MergeFlags(env.get("LIMBER_FLAGS",""))
myenv.MergeFlags(env.get("SWIFTEN_FLAGS",""))
myenv.MergeFlags(env.get("CPPUNIT_FLAGS",""))
myenv.MergeFlags(env.get("LIBIDN_FLAGS", ""))
myenv.MergeFlags(env.get("BOOST_FLAGS", ""))
myenv.MergeFlags(env.get("SQLITE_FLAGS", ""))
myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
myenv.MergeFlags(env.get("ZLIB_FLAGS", ""))
myenv.MergeFlags(env.get("OPENSSL_FLAGS", ""))
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index fddd717..422b56c 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -1,12 +1,13 @@
Import("env")
myenv = env.Clone()
+myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.MergeFlags(env["SLIMBER_FLAGS"])
myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_FLAGS"])
myenv.MergeFlags(env["LIBIDN_FLAGS"])
myenv.MergeFlags(env["BOOST_FLAGS"])
myenv.MergeFlags(env.get("LIBXML_FLAGS", {}))
myenv.MergeFlags(env.get("EXPAT_FLAGS", {}))
myenv.MergeFlags(env.get("AVAHI_FLAGS", {}))
myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
diff --git a/Slimber/Cocoa/SConscript b/Slimber/Cocoa/SConscript
index e2d8221..e122d87 100644
--- a/Slimber/Cocoa/SConscript
+++ b/Slimber/Cocoa/SConscript
@@ -1,12 +1,13 @@
Import("env")
myenv = env.Clone()
+myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.MergeFlags(env["SLIMBER_FLAGS"])
myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_FLAGS"])
myenv.MergeFlags(env["LIBIDN_FLAGS"])
myenv.MergeFlags(env["BOOST_FLAGS"])
myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
myenv.Append(CXXFLAGS = myenv["OBJCCFLAGS"])
myenv.Append(FRAMEWORKS = "Cocoa")
diff --git a/Slimber/SConscript b/Slimber/SConscript
index 9a84c17..11beee6 100644
--- a/Slimber/SConscript
+++ b/Slimber/SConscript
@@ -25,18 +25,19 @@ if "Slimber" in env["PROJECTS"] :
"LIBS": ["Slimber"]
}
################################################################################
# Build
################################################################################
if env["SCONS_STAGE"] == "build" :
myenv = env.Clone()
+ myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.MergeFlags(env["BOOST_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_FLAGS"])
myenv.StaticLibrary("Slimber", [
"LinkLocalPresenceManager.cpp",
"FileVCardCollection.cpp",
"VCardCollection.cpp",
"Server.cpp",
"MainController.cpp",
"MenuletController.cpp",
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp
index 380ce6a..d1d0e24 100644
--- a/Slimber/Server.cpp
+++ b/Slimber/Server.cpp
@@ -15,28 +15,28 @@
#include "Swiften/Session/SessionTracer.h"
#include "Swiften/Elements/Element.h"
#include "Swiften/Elements/Presence.h"
#include "Swiften/Elements/RosterPayload.h"
#include "Swiften/Network/BoostConnection.h"
#include "Swiften/Network/BoostConnectionServer.h"
#include "Swiften/Session/SessionTracer.h"
#include "Swiften/Elements/IQ.h"
#include "Swiften/Elements/VCard.h"
-#include "Swiften/Server/UserRegistry.h"
+#include "Limber/Server/UserRegistry.h"
#include <string>
#include "Swiften/LinkLocal/LinkLocalServiceInfo.h"
#include "Swiften/LinkLocal/OutgoingLinkLocalSession.h"
#include "Swiften/LinkLocal/IncomingLinkLocalSession.h"
#include "Swiften/LinkLocal/LinkLocalServiceBrowser.h"
#include "Swiften/Network/ConnectionServer.h"
#include "Slimber/VCardCollection.h"
#include "Slimber/LinkLocalPresenceManager.h"
-#include "Swiften/Server/ServerFromClientSession.h"
+#include "Limber/Server/ServerFromClientSession.h"
namespace Swift {
Server::Server(
int clientConnectionPort,
int linkLocalConnectionPort,
LinkLocalServiceBrowser* linkLocalServiceBrowser,
VCardCollection* vCardCollection,
EventLoop* eventLoop) :
diff --git a/Slimber/Server.h b/Slimber/Server.h
index 98332fd..d1a2332 100644
--- a/Slimber/Server.h
+++ b/Slimber/Server.h
@@ -6,21 +6,21 @@
#pragma once
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
#include <vector>
#include "Swiften/Network/BoostIOServiceThread.h"
#include "Swiften/Network/BoostConnectionServer.h"
-#include "Swiften/Server/UserRegistry.h"
+#include "Limber/Server/UserRegistry.h"
#include "Swiften/Base/IDGenerator.h"
-#include "Swiften/Server/ServerFromClientSession.h"
+#include "Limber/Server/ServerFromClientSession.h"
#include "Swiften/JID/JID.h"
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
#include "Swiften/LinkLocal/LinkLocalServiceInfo.h"
#include "Slimber/ServerError.h"
namespace Swift {
class DNSSDServiceID;
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 110f202..30fd9b6 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -147,23 +147,18 @@ if env["SCONS_STAGE"] == "build" :
"Serializer/PayloadSerializers/FormSerializer.cpp",
"Serializer/PayloadSerializers/NicknameSerializer.cpp",
"Serializer/PresenceSerializer.cpp",
"Serializer/StanzaSerializer.cpp",
"Serializer/StreamErrorSerializer.cpp",
"Serializer/StreamFeaturesSerializer.cpp",
"Serializer/XML/XMLElement.cpp",
"Serializer/XML/XMLNode.cpp",
"Serializer/XMPPSerializer.cpp",
- "Server/ServerFromClientSession.cpp",
- "Server/ServerSession.cpp",
- "Server/ServerStanzaRouter.cpp",
- "Server/SimpleUserRegistry.cpp",
- "Server/UserRegistry.cpp",
"Session/Session.cpp",
"Session/SessionStream.cpp",
"Session/BasicSessionStream.cpp",
"StringCodecs/Base64.cpp",
"StringCodecs/SHA1.cpp",
"StringCodecs/HMACSHA1.cpp",
"StringCodecs/MD5.cpp",
"StringCodecs/PBKDF2.cpp",
"StringCodecs/Hexify.cpp",