Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-18 10:21:21 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-18 10:21:21 (GMT) |
| commit | 7af8a078c57d94ff63eb81f26de2f55eca6b5c00 (patch) | |
| tree | 6da747b7909de1069ad38f7706eae27afc7b3e70 /Slimber | |
| parent | 774c195afa103a577421541b821be05defa26a84 (diff) | |
| download | swift-contrib-7af8a078c57d94ff63eb81f26de2f55eca6b5c00.zip swift-contrib-7af8a078c57d94ff63eb81f26de2f55eca6b5c00.tar.bz2 | |
Moving unused server code out of Swiften into Limber.
Diffstat (limited to 'Slimber')
| -rw-r--r-- | Slimber/CLI/SConscript | 1 | ||||
| -rw-r--r-- | Slimber/Cocoa/SConscript | 1 | ||||
| -rw-r--r-- | Slimber/SConscript | 1 | ||||
| -rw-r--r-- | Slimber/Server.cpp | 4 | ||||
| -rw-r--r-- | Slimber/Server.h | 4 |
5 files changed, 7 insertions, 4 deletions
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; |