summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/AdHoc/SConscript4
-rw-r--r--Swiften/Avatars/SConscript18
-rw-r--r--Swiften/Base/SConscript36
-rw-r--r--Swiften/Component/SConscript16
-rw-r--r--Swiften/Config/SConscript52
-rw-r--r--Swiften/Crypto/SConscript24
-rw-r--r--Swiften/Disco/SConscript24
-rw-r--r--Swiften/Entity/SConscript4
-rw-r--r--Swiften/EventLoop/SConscript30
-rw-r--r--Swiften/Examples/LinkLocalTool/SConscript4
-rw-r--r--Swiften/Examples/NetworkTool/SConscript12
-rw-r--r--Swiften/Examples/SConscript16
-rw-r--r--Swiften/FileTransfer/SConscript90
-rw-r--r--Swiften/History/SConscript10
-rw-r--r--Swiften/IDN/SConscript30
-rw-r--r--Swiften/JID/SConscript4
-rw-r--r--Swiften/Jingle/SConscript18
-rw-r--r--Swiften/LinkLocal/SConscript60
-rw-r--r--Swiften/Network/SConscript178
-rw-r--r--Swiften/Parser/SConscript210
-rw-r--r--Swiften/Presence/SConscript14
-rw-r--r--Swiften/QA/ClientTest/SConscript20
-rw-r--r--Swiften/QA/ConcurrentFileTransferTest/SConscript20
-rw-r--r--Swiften/QA/DNSSDTest/SConscript30
-rw-r--r--Swiften/QA/FileTransferTest/SConscript24
-rw-r--r--Swiften/QA/NetworkTest/SConscript30
-rw-r--r--Swiften/QA/ProxyProviderTest/SConscript4
-rw-r--r--Swiften/QA/ReconnectTest/SConscript36
-rw-r--r--Swiften/QA/SConscript20
-rw-r--r--Swiften/QA/ScriptedTests/SConscript8
-rw-r--r--Swiften/QA/StorageTest/SConscript32
-rw-r--r--Swiften/QA/TLSTest/SConscript40
-rw-r--r--Swiften/SASL/SConscript44
-rw-r--r--Swiften/SConscript1124
-rw-r--r--Swiften/StreamManagement/SConscript6
-rw-r--r--Swiften/StreamStack/SConscript16
-rw-r--r--Swiften/TLS/SConscript60
-rw-r--r--Swiften/VCards/SConscript6
38 files changed, 1187 insertions, 1187 deletions
diff --git a/Swiften/AdHoc/SConscript b/Swiften/AdHoc/SConscript
index 69c9083..6d3f176 100644
--- a/Swiften/AdHoc/SConscript
+++ b/Swiften/AdHoc/SConscript
@@ -1,6 +1,6 @@
Import("swiften_env")
objects = swiften_env.SwiftenObject([
- "OutgoingAdHocCommandSession.cpp",
- ])
+ "OutgoingAdHocCommandSession.cpp",
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Avatars/SConscript b/Swiften/Avatars/SConscript
index 9c219a4..0cd419d 100644
--- a/Swiften/Avatars/SConscript
+++ b/Swiften/Avatars/SConscript
@@ -1,13 +1,13 @@
Import("swiften_env")
objects = swiften_env.SwiftenObject([
- "VCardUpdateAvatarManager.cpp",
- "VCardAvatarManager.cpp",
- "OfflineAvatarManager.cpp",
- "AvatarManager.cpp",
- "AvatarManagerImpl.cpp",
- "AvatarStorage.cpp",
- "AvatarProvider.cpp",
- "CombinedAvatarProvider.cpp",
- ])
+ "VCardUpdateAvatarManager.cpp",
+ "VCardAvatarManager.cpp",
+ "OfflineAvatarManager.cpp",
+ "AvatarManager.cpp",
+ "AvatarManagerImpl.cpp",
+ "AvatarStorage.cpp",
+ "AvatarProvider.cpp",
+ "CombinedAvatarProvider.cpp",
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Base/SConscript b/Swiften/Base/SConscript
index d7fd7cc..62e5117 100644
--- a/Swiften/Base/SConscript
+++ b/Swiften/Base/SConscript
@@ -1,22 +1,22 @@
Import("swiften_env")
objects = swiften_env.SwiftenObject([
- "ByteArray.cpp",
- "DateTime.cpp",
- "SafeByteArray.cpp",
- "SafeAllocator.cpp",
- "Error.cpp",
- "Log.cpp",
- "Path.cpp",
- "Paths.cpp",
- "String.cpp",
- "IDGenerator.cpp",
- "SimpleIDGenerator.cpp",
- "RandomGenerator.cpp",
- "BoostRandomGenerator.cpp",
- "sleep.cpp",
- "URL.cpp",
- "Regex.cpp",
- "FileSize.cpp"
- ])
+ "ByteArray.cpp",
+ "DateTime.cpp",
+ "SafeByteArray.cpp",
+ "SafeAllocator.cpp",
+ "Error.cpp",
+ "Log.cpp",
+ "Path.cpp",
+ "Paths.cpp",
+ "String.cpp",
+ "IDGenerator.cpp",
+ "SimpleIDGenerator.cpp",
+ "RandomGenerator.cpp",
+ "BoostRandomGenerator.cpp",
+ "sleep.cpp",
+ "URL.cpp",
+ "Regex.cpp",
+ "FileSize.cpp"
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Component/SConscript b/Swiften/Component/SConscript
index ef5700c..2553ac6 100644
--- a/Swiften/Component/SConscript
+++ b/Swiften/Component/SConscript
@@ -1,13 +1,13 @@
Import("swiften_env")
sources = [
- "ComponentHandshakeGenerator.cpp",
- "ComponentConnector.cpp",
- "ComponentSession.cpp",
- "ComponentSessionStanzaChannel.cpp",
- "CoreComponent.cpp",
- "Component.cpp",
- "ComponentXMLTracer.cpp",
- ]
+ "ComponentHandshakeGenerator.cpp",
+ "ComponentConnector.cpp",
+ "ComponentSession.cpp",
+ "ComponentSessionStanzaChannel.cpp",
+ "CoreComponent.cpp",
+ "Component.cpp",
+ "ComponentXMLTracer.cpp",
+ ]
swiften_env.Append(SWIFTEN_OBJECTS = swiften_env.SwiftenObject(sources))
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript
index 837884b..6eddb0e 100644
--- a/Swiften/Config/SConscript
+++ b/Swiften/Config/SConscript
@@ -3,16 +3,16 @@ import os.path
Import("env")
def replaceSwiftenPath(input) :
- return input.replace(env.Dir("#").abspath, "#")
+ return input.replace(env.Dir("#").abspath, "#")
def cStringVariable(env, cVar, sconsVar) :
- result = "static const char* " + cVar + "[] = {\n"
- # FIXME: Probably not very robust
- for var in sconsVar.split(" ") :
- result += "\t\"" + env.subst(var).replace("\\", "\\\\") + "\",\n"
- result += "\t0\n"
- result += "};\n"
- return result
+ result = "static const char* " + cVar + "[] = {\n"
+ # FIXME: Probably not very robust
+ for var in sconsVar.split(" ") :
+ result += "\t\"" + env.subst(var).replace("\\", "\\\\") + "\",\n"
+ result += "\t0\n"
+ result += "};\n"
+ return result
config_flags = ""
@@ -21,36 +21,36 @@ swiften_env.UseFlags(swiften_env["SWIFTEN_FLAGS"])
swiften_env.UseFlags(swiften_env["SWIFTEN_DEP_FLAGS"])
cppflags = replaceSwiftenPath(" ".join([
- swiften_env.subst("$CPPFLAGS").replace("-isystem ","-I"),
- swiften_env.subst("$_CPPDEFFLAGS"),
- swiften_env.subst("$_CPPINCFLAGS")]))
+ swiften_env.subst("$CPPFLAGS").replace("-isystem ","-I"),
+ swiften_env.subst("$_CPPDEFFLAGS"),
+ swiften_env.subst("$_CPPINCFLAGS")]))
config_flags += cStringVariable(swiften_env, "CPPFLAGS", cppflags)
libflags = replaceSwiftenPath(" ".join([
- swiften_env.subst("$_LIBDIRFLAGS"),
- swiften_env.subst("$_LIBFLAGS"),
- swiften_env.subst("$_FRAMEWORKPATH"),
- swiften_env.subst("$_FRAMEWORKS"),
- swiften_env.subst("$_FRAMEWORKSFLAGS")
- ]))
+ swiften_env.subst("$_LIBDIRFLAGS"),
+ swiften_env.subst("$_LIBFLAGS"),
+ swiften_env.subst("$_FRAMEWORKPATH"),
+ swiften_env.subst("$_FRAMEWORKS"),
+ swiften_env.subst("$_FRAMEWORKSFLAGS")
+ ]))
config_flags += cStringVariable(swiften_env, "LIBFLAGS", libflags)
config_env = env.Clone()
# Create a local copy of Paths.cpp to avoid a Swiften dependency
config_env.Install(".", [
- "#/Swiften/Base/Paths.cpp",
- "#/Swiften/Base/Path.cpp",
- "#/Swiften/Base/String.cpp",
+ "#/Swiften/Base/Paths.cpp",
+ "#/Swiften/Base/Path.cpp",
+ "#/Swiften/Base/String.cpp",
])
config_env.UseFlags(config_env["BOOST_FLAGS"])
config_env.UseFlags(config_env["PLATFORM_FLAGS"])
config_env.WriteVal("swiften-config.h", config_env.Value(config_flags))
swiften_config = config_env.Program("swiften-config", [
- "Paths.cpp",
- "Path.cpp",
- "String.cpp",
- "swiften-config.cpp"
- ])
+ "Paths.cpp",
+ "Path.cpp",
+ "String.cpp",
+ "swiften-config.cpp"
+ ])
if swiften_env.get("SWIFTEN_INSTALLDIR", "") :
- swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "bin"), swiften_config)
+ swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "bin"), swiften_config)
diff --git a/Swiften/Crypto/SConscript b/Swiften/Crypto/SConscript
index ce4bdae..d5532fd 100644
--- a/Swiften/Crypto/SConscript
+++ b/Swiften/Crypto/SConscript
@@ -2,27 +2,27 @@ Import("swiften_env", "env")
objects = swiften_env.SwiftenObject([
- "CryptoProvider.cpp",
- "Hash.cpp"
+ "CryptoProvider.cpp",
+ "Hash.cpp"
])
myenv = swiften_env.Clone()
if myenv["PLATFORM"] == "win32" :
- objects += myenv.SwiftenObject(["WindowsCryptoProvider.cpp"])
+ objects += myenv.SwiftenObject(["WindowsCryptoProvider.cpp"])
if myenv.get("HAVE_OPENSSL", False) :
- myenv.Append(CPPDEFINES = ["HAVE_OPENSSL_CRYPTO_PROVIDER"])
- objects += myenv.SwiftenObject(["OpenSSLCryptoProvider.cpp"])
+ myenv.Append(CPPDEFINES = ["HAVE_OPENSSL_CRYPTO_PROVIDER"])
+ objects += myenv.SwiftenObject(["OpenSSLCryptoProvider.cpp"])
if myenv["PLATFORM"] == "darwin" and myenv["target"] == "native" :
- myenv.Append(CPPDEFINES = ["HAVE_COMMONCRYPTO_CRYPTO_PROVIDER"])
- objects += myenv.SwiftenObject(["CommonCryptoCryptoProvider.cpp"])
+ myenv.Append(CPPDEFINES = ["HAVE_COMMONCRYPTO_CRYPTO_PROVIDER"])
+ objects += myenv.SwiftenObject(["CommonCryptoCryptoProvider.cpp"])
objects += myenv.SwiftenObject(["PlatformCryptoProvider.cpp"])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
if env["TEST"] :
- test_env = myenv.Clone()
- test_env.UseFlags(swiften_env["CPPUNIT_FLAGS"])
- env.Append(UNITTEST_OBJECTS = test_env.SwiftenObject([
- File("UnitTest/CryptoProviderTest.cpp"),
- ]))
+ test_env = myenv.Clone()
+ test_env.UseFlags(swiften_env["CPPUNIT_FLAGS"])
+ env.Append(UNITTEST_OBJECTS = test_env.SwiftenObject([
+ File("UnitTest/CryptoProviderTest.cpp"),
+ ]))
diff --git a/Swiften/Disco/SConscript b/Swiften/Disco/SConscript
index 1779e26..15137ae 100644
--- a/Swiften/Disco/SConscript
+++ b/Swiften/Disco/SConscript
@@ -1,16 +1,16 @@
Import("swiften_env")
objects = swiften_env.SwiftenObject([
- "CapsInfoGenerator.cpp",
- "CapsManager.cpp",
- "EntityCapsManager.cpp",
- "EntityCapsProvider.cpp",
- "DummyEntityCapsProvider.cpp",
- "CapsStorage.cpp",
- "ClientDiscoManager.cpp",
- "DiscoInfoResponder.cpp",
- "JIDDiscoInfoResponder.cpp",
- "DiscoServiceWalker.cpp",
- "FeatureOracle.cpp",
- ])
+ "CapsInfoGenerator.cpp",
+ "CapsManager.cpp",
+ "EntityCapsManager.cpp",
+ "EntityCapsProvider.cpp",
+ "DummyEntityCapsProvider.cpp",
+ "CapsStorage.cpp",
+ "ClientDiscoManager.cpp",
+ "DiscoInfoResponder.cpp",
+ "JIDDiscoInfoResponder.cpp",
+ "DiscoServiceWalker.cpp",
+ "FeatureOracle.cpp",
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Entity/SConscript b/Swiften/Entity/SConscript
index 1342ec1..284e0c0 100644
--- a/Swiften/Entity/SConscript
+++ b/Swiften/Entity/SConscript
@@ -1,6 +1,6 @@
Import("swiften_env")
objects = swiften_env.SwiftenObject([
- "Entity.cpp",
- ])
+ "Entity.cpp",
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/EventLoop/SConscript b/Swiften/EventLoop/SConscript
index b810e8c..7aea53f 100644
--- a/Swiften/EventLoop/SConscript
+++ b/Swiften/EventLoop/SConscript
@@ -1,23 +1,23 @@
Import("swiften_env")
sources = [
- "BoostASIOEventLoop.cpp",
- "DummyEventLoop.cpp",
- "Event.cpp",
- "EventLoop.cpp",
- "EventOwner.cpp",
- "SimpleEventLoop.cpp",
- "SingleThreadedEventLoop.cpp",
- ]
+ "BoostASIOEventLoop.cpp",
+ "DummyEventLoop.cpp",
+ "Event.cpp",
+ "EventLoop.cpp",
+ "EventOwner.cpp",
+ "SimpleEventLoop.cpp",
+ "SingleThreadedEventLoop.cpp",
+ ]
objects = swiften_env.SwiftenObject(sources)
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
if swiften_env["PLATFORM"] == "darwin" and swiften_env["target"] == "native" or swiften_env["target"] == 'xcode':
- myenv = swiften_env.Clone()
- myenv.Append(CXXFLAGS = myenv["OBJCCFLAGS"])
- objects = myenv.SwiftenObject([
- "Cocoa/CocoaEventLoop.mm",
- "Cocoa/CocoaEvent.mm"
- ])
- swiften_env.Append(SWIFTEN_OBJECTS = [objects])
+ myenv = swiften_env.Clone()
+ myenv.Append(CXXFLAGS = myenv["OBJCCFLAGS"])
+ objects = myenv.SwiftenObject([
+ "Cocoa/CocoaEventLoop.mm",
+ "Cocoa/CocoaEvent.mm"
+ ])
+ swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Examples/LinkLocalTool/SConscript b/Swiften/Examples/LinkLocalTool/SConscript
index 18eb91f..d7617ed 100644
--- a/Swiften/Examples/LinkLocalTool/SConscript
+++ b/Swiften/Examples/LinkLocalTool/SConscript
@@ -5,5 +5,5 @@ myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
linkLocalTool = myenv.Program("LinkLocalTool", [
- "main.cpp"
- ])
+ "main.cpp"
+ ])
diff --git a/Swiften/Examples/NetworkTool/SConscript b/Swiften/Examples/NetworkTool/SConscript
index 38622ff..c850232 100644
--- a/Swiften/Examples/NetworkTool/SConscript
+++ b/Swiften/Examples/NetworkTool/SConscript
@@ -1,10 +1,10 @@
Import("env")
if env["experimental"] :
- myenv = env.Clone()
- myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
+ myenv = env.Clone()
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
- linkLocalTool = myenv.Program("NetworkTool", [
- "main.cpp"
- ])
+ linkLocalTool = myenv.Program("NetworkTool", [
+ "main.cpp"
+ ])
diff --git a/Swiften/Examples/SConscript b/Swiften/Examples/SConscript
index 8a0a48f..601cba2 100644
--- a/Swiften/Examples/SConscript
+++ b/Swiften/Examples/SConscript
@@ -3,12 +3,12 @@ Import("swiften_env")
myenv = swiften_env.Clone()
SConscript(dirs = [
- "SendMessage",
- "SendFile",
- "ConnectivityTest",
- "LinkLocalTool",
- "NetworkTool",
- "ParserTester",
- "BenchTool",
- "MUCListAndJoin",
+ "SendMessage",
+ "SendFile",
+ "ConnectivityTest",
+ "LinkLocalTool",
+ "NetworkTool",
+ "ParserTester",
+ "BenchTool",
+ "MUCListAndJoin",
])
diff --git a/Swiften/FileTransfer/SConscript b/Swiften/FileTransfer/SConscript
index 41af8d4..83f229b 100644
--- a/Swiften/FileTransfer/SConscript
+++ b/Swiften/FileTransfer/SConscript
@@ -1,52 +1,52 @@
Import("swiften_env", "env")
sources = [
- "ByteArrayReadBytestream.cpp",
- "OutgoingFileTransfer.cpp",
- "OutgoingJingleFileTransfer.cpp",
- "OutgoingFileTransferManager.cpp",
- "IncomingFileTransfer.cpp",
- "IncomingJingleFileTransfer.cpp",
- "IncomingFileTransferManager.cpp",
- "JingleFileTransfer.cpp",
- "FileTransferOptions.cpp",
- "FileTransferTransporter.cpp",
- "FileTransferTransporterFactory.cpp",
- "DefaultFileTransferTransporter.cpp",
- "DefaultFileTransferTransporterFactory.cpp",
- "RemoteJingleTransportCandidateSelector.cpp",
- "LocalJingleTransportCandidateGenerator.cpp",
- "ReadBytestream.cpp",
- "WriteBytestream.cpp",
- "FileReadBytestream.cpp",
- "FileWriteBytestream.cpp",
- "FileTransfer.cpp",
- "TransportSession.cpp",
- "IBBSendTransportSession.cpp",
- "IBBReceiveTransportSession.cpp",
- "SOCKS5BytestreamClientSession.cpp",
- "SOCKS5BytestreamServerManager.cpp",
- "SOCKS5BytestreamServer.cpp",
- "SOCKS5BytestreamServerSession.cpp",
- "SOCKS5BytestreamRegistry.cpp",
- "SOCKS5BytestreamProxiesManager.cpp",
- "SOCKS5BytestreamProxyFinder.cpp",
- "IBBSendSession.cpp",
- "IBBReceiveSession.cpp",
- "FileTransferManager.cpp",
- "FileTransferManagerImpl.cpp",
- "IncrementalBytestreamHashCalculator.cpp",
- "SOCKS5BytestreamServerResourceUser.cpp",
- "SOCKS5BytestreamServerPortForwardingUser.cpp",
- ]
+ "ByteArrayReadBytestream.cpp",
+ "OutgoingFileTransfer.cpp",
+ "OutgoingJingleFileTransfer.cpp",
+ "OutgoingFileTransferManager.cpp",
+ "IncomingFileTransfer.cpp",
+ "IncomingJingleFileTransfer.cpp",
+ "IncomingFileTransferManager.cpp",
+ "JingleFileTransfer.cpp",
+ "FileTransferOptions.cpp",
+ "FileTransferTransporter.cpp",
+ "FileTransferTransporterFactory.cpp",
+ "DefaultFileTransferTransporter.cpp",
+ "DefaultFileTransferTransporterFactory.cpp",
+ "RemoteJingleTransportCandidateSelector.cpp",
+ "LocalJingleTransportCandidateGenerator.cpp",
+ "ReadBytestream.cpp",
+ "WriteBytestream.cpp",
+ "FileReadBytestream.cpp",
+ "FileWriteBytestream.cpp",
+ "FileTransfer.cpp",
+ "TransportSession.cpp",
+ "IBBSendTransportSession.cpp",
+ "IBBReceiveTransportSession.cpp",
+ "SOCKS5BytestreamClientSession.cpp",
+ "SOCKS5BytestreamServerManager.cpp",
+ "SOCKS5BytestreamServer.cpp",
+ "SOCKS5BytestreamServerSession.cpp",
+ "SOCKS5BytestreamRegistry.cpp",
+ "SOCKS5BytestreamProxiesManager.cpp",
+ "SOCKS5BytestreamProxyFinder.cpp",
+ "IBBSendSession.cpp",
+ "IBBReceiveSession.cpp",
+ "FileTransferManager.cpp",
+ "FileTransferManagerImpl.cpp",
+ "IncrementalBytestreamHashCalculator.cpp",
+ "SOCKS5BytestreamServerResourceUser.cpp",
+ "SOCKS5BytestreamServerPortForwardingUser.cpp",
+ ]
swiften_env.Append(SWIFTEN_OBJECTS = swiften_env.SwiftenObject(sources))
env.Append(UNITTEST_SOURCES = [
- File("UnitTest/SOCKS5BytestreamServerSessionTest.cpp"),
- File("UnitTest/SOCKS5BytestreamClientSessionTest.cpp"),
- File("UnitTest/IBBSendSessionTest.cpp"),
- File("UnitTest/IBBReceiveSessionTest.cpp"),
- File("UnitTest/IncomingJingleFileTransferTest.cpp"),
- File("UnitTest/OutgoingJingleFileTransferTest.cpp"),
- ])
+ File("UnitTest/SOCKS5BytestreamServerSessionTest.cpp"),
+ File("UnitTest/SOCKS5BytestreamClientSessionTest.cpp"),
+ File("UnitTest/IBBSendSessionTest.cpp"),
+ File("UnitTest/IBBReceiveSessionTest.cpp"),
+ File("UnitTest/IncomingJingleFileTransferTest.cpp"),
+ File("UnitTest/OutgoingJingleFileTransferTest.cpp"),
+ ])
diff --git a/Swiften/History/SConscript b/Swiften/History/SConscript
index bd56818..65be489 100644
--- a/Swiften/History/SConscript
+++ b/Swiften/History/SConscript
@@ -2,10 +2,10 @@ Import("swiften_env")
myenv = swiften_env.Clone()
if myenv["target"] == "native":
- myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS", {}))
+ myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS", {}))
if myenv["experimental"]:
- objects = myenv.SwiftenObject([
- "SQLiteHistoryStorage.cpp",
- ])
- swiften_env.Append(SWIFTEN_OBJECTS = [objects])
+ objects = myenv.SwiftenObject([
+ "SQLiteHistoryStorage.cpp",
+ ])
+ swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/IDN/SConscript b/Swiften/IDN/SConscript
index 7a3c061..28596f7 100644
--- a/Swiften/IDN/SConscript
+++ b/Swiften/IDN/SConscript
@@ -5,27 +5,27 @@ objects = swiften_env.SwiftenObject(["IDNConverter.cpp"])
myenv = swiften_env.Clone()
if myenv.get("NEED_IDN"):
- myenv.Append(CPPDEFINES = ["NEED_IDN"])
+ myenv.Append(CPPDEFINES = ["NEED_IDN"])
if myenv.get("HAVE_ICU") :
- myenv.MergeFlags(swiften_env["ICU_FLAGS"])
- myenv.Append(CPPDEFINES = ["HAVE_ICU"])
- objects += myenv.SwiftenObject(["ICUConverter.cpp"])
+ myenv.MergeFlags(swiften_env["ICU_FLAGS"])
+ myenv.Append(CPPDEFINES = ["HAVE_ICU"])
+ objects += myenv.SwiftenObject(["ICUConverter.cpp"])
if myenv.get("HAVE_LIBIDN") :
- myenv.MergeFlags(swiften_env["LIBIDN_FLAGS"])
- myenv.Append(CPPDEFINES = ["HAVE_LIBIDN"])
- objects += myenv.SwiftenObject(["LibIDNConverter.cpp"])
+ myenv.MergeFlags(swiften_env["LIBIDN_FLAGS"])
+ myenv.Append(CPPDEFINES = ["HAVE_LIBIDN"])
+ objects += myenv.SwiftenObject(["LibIDNConverter.cpp"])
objects += myenv.SwiftenObject([
- "PlatformIDNConverter.cpp"
- ])
+ "PlatformIDNConverter.cpp"
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
if env["TEST"] :
- test_env = myenv.Clone()
- test_env.UseFlags(swiften_env["CPPUNIT_FLAGS"])
- env.Append(UNITTEST_OBJECTS = test_env.SwiftenObject([
- File("UnitTest/IDNConverterTest.cpp"),
- File("UnitTest/UTF8ValidatorTest.cpp")
- ]))
+ test_env = myenv.Clone()
+ test_env.UseFlags(swiften_env["CPPUNIT_FLAGS"])
+ env.Append(UNITTEST_OBJECTS = test_env.SwiftenObject([
+ File("UnitTest/IDNConverterTest.cpp"),
+ File("UnitTest/UTF8ValidatorTest.cpp")
+ ]))
diff --git a/Swiften/JID/SConscript b/Swiften/JID/SConscript
index 12565fc..122388e 100644
--- a/Swiften/JID/SConscript
+++ b/Swiften/JID/SConscript
@@ -2,6 +2,6 @@ Import("swiften_env")
myenv = swiften_env.Clone()
objects = myenv.SwiftenObject([
- "JID.cpp",
- ])
+ "JID.cpp",
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Jingle/SConscript b/Swiften/Jingle/SConscript
index 546c1b2..4d25a78 100644
--- a/Swiften/Jingle/SConscript
+++ b/Swiften/Jingle/SConscript
@@ -1,14 +1,14 @@
Import("swiften_env")
sources = [
- "JingleSession.cpp",
- "JingleSessionListener.cpp",
- "AbstractJingleSessionListener.cpp",
- "JingleSessionImpl.cpp",
- "IncomingJingleSessionHandler.cpp",
- "JingleSessionManager.cpp",
- "JingleResponder.cpp",
- "FakeJingleSession.cpp",
- ]
+ "JingleSession.cpp",
+ "JingleSessionListener.cpp",
+ "AbstractJingleSessionListener.cpp",
+ "JingleSessionImpl.cpp",
+ "IncomingJingleSessionHandler.cpp",
+ "JingleSessionManager.cpp",
+ "JingleResponder.cpp",
+ "FakeJingleSession.cpp",
+ ]
swiften_env.Append(SWIFTEN_OBJECTS = swiften_env.SwiftenObject(sources))
diff --git a/Swiften/LinkLocal/SConscript b/Swiften/LinkLocal/SConscript
index 29ea692..697037a 100644
--- a/Swiften/LinkLocal/SConscript
+++ b/Swiften/LinkLocal/SConscript
@@ -4,39 +4,39 @@ myenv = swiften_env.Clone()
myenv.MergeFlags(swiften_env.get("BONJOUR_FLAGS", ""))
sources = [
- "DNSSD/DNSSDBrowseQuery.cpp",
- "DNSSD/DNSSDQuerier.cpp",
- "DNSSD/DNSSDRegisterQuery.cpp",
- "DNSSD/DNSSDResolveHostnameQuery.cpp",
- "DNSSD/DNSSDResolveServiceQuery.cpp",
- "DNSSD/DNSSDServiceID.cpp",
- "DNSSD/Fake/FakeDNSSDQuerier.cpp",
- "DNSSD/Fake/FakeDNSSDQuery.cpp",
- "DNSSD/PlatformDNSSDQuerierFactory.cpp",
- "IncomingLinkLocalSession.cpp",
- "LinkLocalConnector.cpp",
- "LinkLocalService.cpp",
- "LinkLocalServiceBrowser.cpp",
- "LinkLocalServiceInfo.cpp",
- "OutgoingLinkLocalSession.cpp",
- ]
+ "DNSSD/DNSSDBrowseQuery.cpp",
+ "DNSSD/DNSSDQuerier.cpp",
+ "DNSSD/DNSSDRegisterQuery.cpp",
+ "DNSSD/DNSSDResolveHostnameQuery.cpp",
+ "DNSSD/DNSSDResolveServiceQuery.cpp",
+ "DNSSD/DNSSDServiceID.cpp",
+ "DNSSD/Fake/FakeDNSSDQuerier.cpp",
+ "DNSSD/Fake/FakeDNSSDQuery.cpp",
+ "DNSSD/PlatformDNSSDQuerierFactory.cpp",
+ "IncomingLinkLocalSession.cpp",
+ "LinkLocalConnector.cpp",
+ "LinkLocalService.cpp",
+ "LinkLocalServiceBrowser.cpp",
+ "LinkLocalServiceInfo.cpp",
+ "OutgoingLinkLocalSession.cpp",
+ ]
if myenv.get("HAVE_BONJOUR", 0) :
- myenv.Append(CPPDEFINES = "HAVE_BONJOUR")
- sources += [
- "DNSSD/Bonjour/BonjourQuerier.cpp",
- "DNSSD/Bonjour/BonjourQuery.cpp",
- ]
+ myenv.Append(CPPDEFINES = "HAVE_BONJOUR")
+ sources += [
+ "DNSSD/Bonjour/BonjourQuerier.cpp",
+ "DNSSD/Bonjour/BonjourQuery.cpp",
+ ]
elif myenv.get("HAVE_AVAHI", 0) :
- myenv.Append(CPPDEFINES = ["HAVE_AVAHI"])
- sources += [
- "DNSSD/Avahi/AvahiQuerier.cpp",
- "DNSSD/Avahi/AvahiQuery.cpp",
- "DNSSD/Avahi/AvahiResolveHostnameQuery.cpp",
- "DNSSD/Avahi/AvahiResolveServiceQuery.cpp",
- "DNSSD/Avahi/AvahiRegisterQuery.cpp",
- "DNSSD/Avahi/AvahiBrowseQuery.cpp",
- ]
+ myenv.Append(CPPDEFINES = ["HAVE_AVAHI"])
+ sources += [
+ "DNSSD/Avahi/AvahiQuerier.cpp",
+ "DNSSD/Avahi/AvahiQuery.cpp",
+ "DNSSD/Avahi/AvahiResolveHostnameQuery.cpp",
+ "DNSSD/Avahi/AvahiResolveServiceQuery.cpp",
+ "DNSSD/Avahi/AvahiRegisterQuery.cpp",
+ "DNSSD/Avahi/AvahiBrowseQuery.cpp",
+ ]
objects = myenv.SwiftenObject(sources)
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Network/SConscript b/Swiften/Network/SConscript
index e9da1bc..9c2a134 100644
--- a/Swiften/Network/SConscript
+++ b/Swiften/Network/SConscript
@@ -3,109 +3,109 @@ Import("swiften_env")
myenv = swiften_env.Clone()
if myenv.get("unbound", False) :
- myenv.MergeFlags(myenv.get("UNBOUND_FLAGS", {}))
- myenv.MergeFlags(myenv.get("LDNS_FLAGS", {}))
+ myenv.MergeFlags(myenv.get("UNBOUND_FLAGS", {}))
+ myenv.MergeFlags(myenv.get("LDNS_FLAGS", {}))
sourceList = [
- "ProxiedConnection.cpp",
- "HTTPConnectProxiedConnection.cpp",
- "HTTPConnectProxiedConnectionFactory.cpp",
- "SOCKS5ProxiedConnection.cpp",
- "SOCKS5ProxiedConnectionFactory.cpp",
- "BoostConnection.cpp",
- "BoostConnectionFactory.cpp",
- "BoostConnectionServer.cpp",
- "BoostConnectionServerFactory.cpp",
- "BoostIOServiceThread.cpp",
- "BOSHConnection.cpp",
- "BOSHConnectionPool.cpp",
- "CachingDomainNameResolver.cpp",
- "ConnectionFactory.cpp",
- "ConnectionServer.cpp",
- "ConnectionServerFactory.cpp",
- "DummyConnection.cpp",
- "FakeConnection.cpp",
- "ChainedConnector.cpp",
- "Connector.cpp",
- "Connection.cpp",
- "TimerFactory.cpp",
- "DummyTimerFactory.cpp",
- "BoostTimerFactory.cpp",
- "DomainNameResolver.cpp",
- "DomainNameAddressQuery.cpp",
- "DomainNameServiceQuery.cpp",
- "StaticDomainNameResolver.cpp",
- "HostAddress.cpp",
- "HostAddressPort.cpp",
- "HostNameOrAddress.cpp",
- "NetworkFactories.cpp",
- "BoostNetworkFactories.cpp",
- "NetworkEnvironment.cpp",
- "Timer.cpp",
- "TLSConnection.cpp",
- "TLSConnectionFactory.cpp",
- "BoostTimer.cpp",
- "ProxyProvider.cpp",
- "NullProxyProvider.cpp",
- "NATTraverser.cpp",
- "NullNATTraverser.cpp",
- "NATTraversalGetPublicIPRequest.cpp",
- "NATTraversalForwardPortRequest.cpp",
- "NATTraversalRemovePortForwardingRequest.cpp",
- "NATTraversalInterface.cpp",
- "HTTPTrafficFilter.cpp",
- ]
+ "ProxiedConnection.cpp",
+ "HTTPConnectProxiedConnection.cpp",
+ "HTTPConnectProxiedConnectionFactory.cpp",
+ "SOCKS5ProxiedConnection.cpp",
+ "SOCKS5ProxiedConnectionFactory.cpp",
+ "BoostConnection.cpp",
+ "BoostConnectionFactory.cpp",
+ "BoostConnectionServer.cpp",
+ "BoostConnectionServerFactory.cpp",
+ "BoostIOServiceThread.cpp",
+ "BOSHConnection.cpp",
+ "BOSHConnectionPool.cpp",
+ "CachingDomainNameResolver.cpp",
+ "ConnectionFactory.cpp",
+ "ConnectionServer.cpp",
+ "ConnectionServerFactory.cpp",
+ "DummyConnection.cpp",
+ "FakeConnection.cpp",
+ "ChainedConnector.cpp",
+ "Connector.cpp",
+ "Connection.cpp",
+ "TimerFactory.cpp",
+ "DummyTimerFactory.cpp",
+ "BoostTimerFactory.cpp",
+ "DomainNameResolver.cpp",
+ "DomainNameAddressQuery.cpp",
+ "DomainNameServiceQuery.cpp",
+ "StaticDomainNameResolver.cpp",
+ "HostAddress.cpp",
+ "HostAddressPort.cpp",
+ "HostNameOrAddress.cpp",
+ "NetworkFactories.cpp",
+ "BoostNetworkFactories.cpp",
+ "NetworkEnvironment.cpp",
+ "Timer.cpp",
+ "TLSConnection.cpp",
+ "TLSConnectionFactory.cpp",
+ "BoostTimer.cpp",
+ "ProxyProvider.cpp",
+ "NullProxyProvider.cpp",
+ "NATTraverser.cpp",
+ "NullNATTraverser.cpp",
+ "NATTraversalGetPublicIPRequest.cpp",
+ "NATTraversalForwardPortRequest.cpp",
+ "NATTraversalRemovePortForwardingRequest.cpp",
+ "NATTraversalInterface.cpp",
+ "HTTPTrafficFilter.cpp",
+ ]
if myenv.get("unbound", False) :
- myenv.Append(CPPDEFINES = "USE_UNBOUND")
- sourceList.append("UnboundDomainNameResolver.cpp")
+ myenv.Append(CPPDEFINES = "USE_UNBOUND")
+ sourceList.append("UnboundDomainNameResolver.cpp")
else :
- sourceList.append("PlatformDomainNameResolver.cpp")
- sourceList.append("PlatformDomainNameServiceQuery.cpp")
- sourceList.append("PlatformDomainNameAddressQuery.cpp")
+ sourceList.append("PlatformDomainNameResolver.cpp")
+ sourceList.append("PlatformDomainNameServiceQuery.cpp")
+ sourceList.append("PlatformDomainNameAddressQuery.cpp")
if myenv["PLATFORM"] == "darwin" and myenv["target"] != "android":
- myenv.Append(FRAMEWORKS = ["CoreServices", "SystemConfiguration"])
- sourceList += [ "MacOSXProxyProvider.cpp" ]
- sourceList += [ "UnixNetworkEnvironment.cpp" ]
+ myenv.Append(FRAMEWORKS = ["CoreServices", "SystemConfiguration"])
+ sourceList += [ "MacOSXProxyProvider.cpp" ]
+ sourceList += [ "UnixNetworkEnvironment.cpp" ]
elif myenv["PLATFORM"] == "win32" :
- sourceList += [ "WindowsProxyProvider.cpp" ]
- sourceList += [ "WindowsNetworkEnvironment.cpp" ]
+ sourceList += [ "WindowsProxyProvider.cpp" ]
+ sourceList += [ "WindowsNetworkEnvironment.cpp" ]
elif myenv["PLATFORM"] == "sunos" :
- sourceList += [ "UnixProxyProvider.cpp" ]
- sourceList += [ "SolarisNetworkEnvironment.cpp" ]
- sourceList += [ "EnvironmentProxyProvider.cpp" ]
+ sourceList += [ "UnixProxyProvider.cpp" ]
+ sourceList += [ "SolarisNetworkEnvironment.cpp" ]
+ sourceList += [ "EnvironmentProxyProvider.cpp" ]
else :
- sourceList += [ "UnixNetworkEnvironment.cpp" ]
- sourceList += [ "UnixProxyProvider.cpp" ]
- sourceList += [ "EnvironmentProxyProvider.cpp" ]
- if myenv.get("HAVE_GCONF", 0) :
- myenv.Append(CPPDEFINES = "HAVE_GCONF")
- myenv.MergeFlags(myenv["GCONF_FLAGS"])
- sourceList += [ "GConfProxyProvider.cpp" ]
+ sourceList += [ "UnixNetworkEnvironment.cpp" ]
+ sourceList += [ "UnixProxyProvider.cpp" ]
+ sourceList += [ "EnvironmentProxyProvider.cpp" ]
+ if myenv.get("HAVE_GCONF", 0) :
+ myenv.Append(CPPDEFINES = "HAVE_GCONF")
+ myenv.MergeFlags(myenv["GCONF_FLAGS"])
+ sourceList += [ "GConfProxyProvider.cpp" ]
objects = myenv.SwiftenObject(sourceList)
if myenv["experimental_ft"] :
- # LibNATPMP classes
- if myenv.get("HAVE_LIBNATPMP", False) :
- natpmp_env = myenv.Clone()
- natpmp_env.Append(CPPDEFINES = natpmp_env["LIBNATPMP_FLAGS"].get("INTERNAL_CPPDEFINES", []))
- myenv.Append(CPPDEFINES = ["HAVE_LIBNATPMP"])
- objects += natpmp_env.SwiftenObject([
- "NATPMPInterface.cpp",
- ])
+ # LibNATPMP classes
+ if myenv.get("HAVE_LIBNATPMP", False) :
+ natpmp_env = myenv.Clone()
+ natpmp_env.Append(CPPDEFINES = natpmp_env["LIBNATPMP_FLAGS"].get("INTERNAL_CPPDEFINES", []))
+ myenv.Append(CPPDEFINES = ["HAVE_LIBNATPMP"])
+ objects += natpmp_env.SwiftenObject([
+ "NATPMPInterface.cpp",
+ ])
- # LibMINIUPnP classes
- if myenv.get("HAVE_LIBMINIUPNPC", False) :
- upnp_env = myenv.Clone()
- upnp_env.Append(CPPDEFINES = upnp_env["LIBMINIUPNPC_FLAGS"].get("INTERNAL_CPPDEFINES", []))
- myenv.Append(CPPDEFINES = ["HAVE_LIBMINIUPNPC"])
- objects += upnp_env.SwiftenObject([
- "MiniUPnPInterface.cpp",
- ])
- objects += myenv.SwiftenObject([
- "PlatformNATTraversalWorker.cpp",
- ])
+ # LibMINIUPnP classes
+ if myenv.get("HAVE_LIBMINIUPNPC", False) :
+ upnp_env = myenv.Clone()
+ upnp_env.Append(CPPDEFINES = upnp_env["LIBMINIUPNPC_FLAGS"].get("INTERNAL_CPPDEFINES", []))
+ myenv.Append(CPPDEFINES = ["HAVE_LIBMINIUPNPC"])
+ objects += upnp_env.SwiftenObject([
+ "MiniUPnPInterface.cpp",
+ ])
+ objects += myenv.SwiftenObject([
+ "PlatformNATTraversalWorker.cpp",
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Parser/SConscript b/Swiften/Parser/SConscript
index 03870e5..840cbda 100644
--- a/Swiften/Parser/SConscript
+++ b/Swiften/Parser/SConscript
@@ -6,114 +6,114 @@ myenv.MergeFlags(swiften_env.get("LIBXML_FLAGS", ""))
myenv.MergeFlags(swiften_env.get("EXPAT_FLAGS", ""))
sources = [
- "AttributeMap.cpp",
- "AuthRequestParser.cpp",
- "AuthChallengeParser.cpp",
- "AuthSuccessParser.cpp",
- "AuthResponseParser.cpp",
- "CompressParser.cpp",
- "ElementParser.cpp",
- "IQParser.cpp",
- "MessageParser.cpp",
- "PayloadParser.cpp",
- "StanzaAckParser.cpp",
- "BOSHBodyExtractor.cpp",
- "ComponentHandshakeParser.cpp",
- "PayloadParserFactory.cpp",
- "PayloadParserFactoryCollection.cpp",
- "PayloadParsers/BodyParser.cpp",
- "PayloadParsers/SubjectParser.cpp",
- "PayloadParsers/ThreadParser.cpp",
- "PayloadParsers/CarbonsEnableParser.cpp",
- "PayloadParsers/CarbonsDisableParser.cpp",
- "PayloadParsers/CarbonsPrivateParser.cpp",
- "PayloadParsers/CarbonsReceivedParser.cpp",
- "PayloadParsers/CarbonsSentParser.cpp",
- "PayloadParsers/ChatStateParser.cpp",
- "PayloadParsers/CapsInfoParser.cpp",
- "PayloadParsers/DiscoInfoParser.cpp",
- "PayloadParsers/DiscoItemsParser.cpp",
- "PayloadParsers/ErrorParser.cpp",
- "PayloadParsers/FormParser.cpp",
- "PayloadParsers/IBBParser.cpp",
- "PayloadParsers/JingleParser.cpp",
- "PayloadParsers/JingleReasonParser.cpp",
- "PayloadParsers/JingleContentPayloadParser.cpp",
- "PayloadParsers/JingleIBBTransportMethodPayloadParser.cpp",
- "PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp",
- "PayloadParsers/JingleFileTransferDescriptionParser.cpp",
- "PayloadParsers/JingleFileTransferHashParser.cpp",
- "PayloadParsers/JingleFileTransferFileInfoParser.cpp",
- "PayloadParsers/StreamInitiationFileInfoParser.cpp",
- "PayloadParsers/CommandParser.cpp",
- "PayloadParsers/InBandRegistrationPayloadParser.cpp",
- "PayloadParsers/SearchPayloadParser.cpp",
- "PayloadParsers/FullPayloadParserFactoryCollection.cpp",
- "PayloadParsers/PriorityParser.cpp",
- "PayloadParsers/PrivateStorageParser.cpp",
- "PayloadParsers/RawXMLPayloadParser.cpp",
- "PayloadParsers/ResourceBindParser.cpp",
- "PayloadParsers/RosterItemExchangeParser.cpp",
- "PayloadParsers/RosterParser.cpp",
- "PayloadParsers/SecurityLabelParser.cpp",
- "PayloadParsers/SecurityLabelsCatalogParser.cpp",
- "PayloadParsers/SoftwareVersionParser.cpp",
- "PayloadParsers/StorageParser.cpp",
- "PayloadParsers/StatusParser.cpp",
- "PayloadParsers/StatusShowParser.cpp",
- "PayloadParsers/StreamInitiationParser.cpp",
- "PayloadParsers/BytestreamsParser.cpp",
- "PayloadParsers/VCardParser.cpp",
- "PayloadParsers/VCardUpdateParser.cpp",
- "PayloadParsers/DelayParser.cpp",
- "PayloadParsers/MUCUserPayloadParser.cpp",
- "PayloadParsers/MUCAdminPayloadParser.cpp",
- "PayloadParsers/MUCOwnerPayloadParser.cpp",
- "PayloadParsers/MUCDestroyPayloadParser.cpp",
- "PayloadParsers/MUCInvitationPayloadParser.cpp",
- "PayloadParsers/MUCItemParser.cpp",
- "PayloadParsers/NicknameParser.cpp",
- "PayloadParsers/ReplaceParser.cpp",
- "PayloadParsers/LastParser.cpp",
- "PayloadParsers/IdleParser.cpp",
- "PayloadParsers/S5BProxyRequestParser.cpp",
- "PayloadParsers/DeliveryReceiptParser.cpp",
- "PayloadParsers/DeliveryReceiptRequestParser.cpp",
- "PayloadParsers/UserLocationParser.cpp",
- "PayloadParsers/UserTuneParser.cpp",
- "PayloadParsers/WhiteboardParser.cpp",
- "PayloadParsers/PubSubErrorParserFactory.cpp",
- "PayloadParsers/ResultSetParser.cpp",
- "PayloadParsers/ForwardedParser.cpp",
- "PayloadParsers/MAMFinParser.cpp",
- "PayloadParsers/MAMResultParser.cpp",
- "PayloadParsers/MAMQueryParser.cpp",
- "PayloadParsers/IsodeIQDelegationParser.cpp",
- "PlatformXMLParserFactory.cpp",
- "PresenceParser.cpp",
- "SerializingParser.cpp",
- "StanzaParser.cpp",
- "StreamErrorParser.cpp",
- "StreamFeaturesParser.cpp",
- "StreamManagementEnabledParser.cpp",
- "StreamResumeParser.cpp",
- "StreamResumedParser.cpp",
- "Tree/ParserElement.cpp",
- "Tree/NullParserElement.cpp",
- "Tree/TreeReparser.cpp",
- "XMLParser.cpp",
- "XMLParserClient.cpp",
- "XMLParserFactory.cpp",
- "XMPPParser.cpp",
- "XMPPParserClient.cpp",
- ]
+ "AttributeMap.cpp",
+ "AuthRequestParser.cpp",
+ "AuthChallengeParser.cpp",
+ "AuthSuccessParser.cpp",
+ "AuthResponseParser.cpp",
+ "CompressParser.cpp",
+ "ElementParser.cpp",
+ "IQParser.cpp",
+ "MessageParser.cpp",
+ "PayloadParser.cpp",
+ "StanzaAckParser.cpp",
+ "BOSHBodyExtractor.cpp",
+ "ComponentHandshakeParser.cpp",
+ "PayloadParserFactory.cpp",
+ "PayloadParserFactoryCollection.cpp",
+ "PayloadParsers/BodyParser.cpp",
+ "PayloadParsers/SubjectParser.cpp",
+ "PayloadParsers/ThreadParser.cpp",
+ "PayloadParsers/CarbonsEnableParser.cpp",
+ "PayloadParsers/CarbonsDisableParser.cpp",
+ "PayloadParsers/CarbonsPrivateParser.cpp",
+ "PayloadParsers/CarbonsReceivedParser.cpp",
+ "PayloadParsers/CarbonsSentParser.cpp",
+ "PayloadParsers/ChatStateParser.cpp",
+ "PayloadParsers/CapsInfoParser.cpp",
+ "PayloadParsers/DiscoInfoParser.cpp",
+ "PayloadParsers/DiscoItemsParser.cpp",
+ "PayloadParsers/ErrorParser.cpp",
+ "PayloadParsers/FormParser.cpp",
+ "PayloadParsers/IBBParser.cpp",
+ "PayloadParsers/JingleParser.cpp",
+ "PayloadParsers/JingleReasonParser.cpp",
+ "PayloadParsers/JingleContentPayloadParser.cpp",
+ "PayloadParsers/JingleIBBTransportMethodPayloadParser.cpp",
+ "PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp",
+ "PayloadParsers/JingleFileTransferDescriptionParser.cpp",
+ "PayloadParsers/JingleFileTransferHashParser.cpp",
+ "PayloadParsers/JingleFileTransferFileInfoParser.cpp",
+ "PayloadParsers/StreamInitiationFileInfoParser.cpp",
+ "PayloadParsers/CommandParser.cpp",
+ "PayloadParsers/InBandRegistrationPayloadParser.cpp",
+ "PayloadParsers/SearchPayloadParser.cpp",
+ "PayloadParsers/FullPayloadParserFactoryCollection.cpp",
+ "PayloadParsers/PriorityParser.cpp",
+ "PayloadParsers/PrivateStorageParser.cpp",
+ "PayloadParsers/RawXMLPayloadParser.cpp",
+ "PayloadParsers/ResourceBindParser.cpp",
+ "PayloadParsers/RosterItemExchangeParser.cpp",
+ "PayloadParsers/RosterParser.cpp",
+ "PayloadParsers/SecurityLabelParser.cpp",
+ "PayloadParsers/SecurityLabelsCatalogParser.cpp",
+ "PayloadParsers/SoftwareVersionParser.cpp",
+ "PayloadParsers/StorageParser.cpp",
+ "PayloadParsers/StatusParser.cpp",
+ "PayloadParsers/StatusShowParser.cpp",
+ "PayloadParsers/StreamInitiationParser.cpp",
+ "PayloadParsers/BytestreamsParser.cpp",
+ "PayloadParsers/VCardParser.cpp",
+ "PayloadParsers/VCardUpdateParser.cpp",
+ "PayloadParsers/DelayParser.cpp",
+ "PayloadParsers/MUCUserPayloadParser.cpp",
+ "PayloadParsers/MUCAdminPayloadParser.cpp",
+ "PayloadParsers/MUCOwnerPayloadParser.cpp",
+ "PayloadParsers/MUCDestroyPayloadParser.cpp",
+ "PayloadParsers/MUCInvitationPayloadParser.cpp",
+ "PayloadParsers/MUCItemParser.cpp",
+ "PayloadParsers/NicknameParser.cpp",
+ "PayloadParsers/ReplaceParser.cpp",
+ "PayloadParsers/LastParser.cpp",
+ "PayloadParsers/IdleParser.cpp",
+ "PayloadParsers/S5BProxyRequestParser.cpp",
+ "PayloadParsers/DeliveryReceiptParser.cpp",
+ "PayloadParsers/DeliveryReceiptRequestParser.cpp",
+ "PayloadParsers/UserLocationParser.cpp",
+ "PayloadParsers/UserTuneParser.cpp",
+ "PayloadParsers/WhiteboardParser.cpp",
+ "PayloadParsers/PubSubErrorParserFactory.cpp",
+ "PayloadParsers/ResultSetParser.cpp",
+ "PayloadParsers/ForwardedParser.cpp",
+ "PayloadParsers/MAMFinParser.cpp",
+ "PayloadParsers/MAMResultParser.cpp",
+ "PayloadParsers/MAMQueryParser.cpp",
+ "PayloadParsers/IsodeIQDelegationParser.cpp",
+ "PlatformXMLParserFactory.cpp",
+ "PresenceParser.cpp",
+ "SerializingParser.cpp",
+ "StanzaParser.cpp",
+ "StreamErrorParser.cpp",
+ "StreamFeaturesParser.cpp",
+ "StreamManagementEnabledParser.cpp",
+ "StreamResumeParser.cpp",
+ "StreamResumedParser.cpp",
+ "Tree/ParserElement.cpp",
+ "Tree/NullParserElement.cpp",
+ "Tree/TreeReparser.cpp",
+ "XMLParser.cpp",
+ "XMLParserClient.cpp",
+ "XMLParserFactory.cpp",
+ "XMPPParser.cpp",
+ "XMPPParserClient.cpp",
+ ]
if myenv.get("HAVE_EXPAT", 0) :
- myenv.Append(CPPDEFINES = "HAVE_EXPAT")
- sources += ["ExpatParser.cpp"]
+ myenv.Append(CPPDEFINES = "HAVE_EXPAT")
+ sources += ["ExpatParser.cpp"]
if myenv.get("HAVE_LIBXML", 0) :
- myenv.Append(CPPDEFINES = "HAVE_LIBXML")
- sources += ["LibXMLParser.cpp"]
+ myenv.Append(CPPDEFINES = "HAVE_LIBXML")
+ sources += ["LibXMLParser.cpp"]
objects = myenv.SwiftenObject(sources)
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Presence/SConscript b/Swiften/Presence/SConscript
index 33acbd3..c3e32f2 100644
--- a/Swiften/Presence/SConscript
+++ b/Swiften/Presence/SConscript
@@ -1,11 +1,11 @@
Import("swiften_env")
objects = swiften_env.SwiftenObject([
- "PresenceOracle.cpp",
- "PresenceSender.cpp",
- "DirectedPresenceSender.cpp",
- "PayloadAddingPresenceSender.cpp",
- "StanzaChannelPresenceSender.cpp",
- "SubscriptionManager.cpp",
- ])
+ "PresenceOracle.cpp",
+ "PresenceSender.cpp",
+ "DirectedPresenceSender.cpp",
+ "PayloadAddingPresenceSender.cpp",
+ "StanzaChannelPresenceSender.cpp",
+ "SubscriptionManager.cpp",
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript
index 15a68c6..812c472 100644
--- a/Swiften/QA/ClientTest/SConscript
+++ b/Swiften/QA/ClientTest/SConscript
@@ -3,15 +3,15 @@ import os
Import("env")
if env["TEST"] :
- myenv = env.Clone()
- myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
- myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
+ myenv = env.Clone()
+ myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
- for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
- if ARGUMENTS.get(i.lower(), False) :
- myenv["ENV"][i] = ARGUMENTS[i.lower()]
- elif os.environ.get(i, "") :
- myenv["ENV"][i] = os.environ[i]
+ for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
+ if ARGUMENTS.get(i.lower(), False) :
+ myenv["ENV"][i] = ARGUMENTS[i.lower()]
+ elif os.environ.get(i, "") :
+ myenv["ENV"][i] = os.environ[i]
- tester = myenv.Program("ClientTest", ["ClientTest.cpp"])
- myenv.Test(tester, "system")
+ tester = myenv.Program("ClientTest", ["ClientTest.cpp"])
+ myenv.Test(tester, "system")
diff --git a/Swiften/QA/ConcurrentFileTransferTest/SConscript b/Swiften/QA/ConcurrentFileTransferTest/SConscript
index 1b4cdbc..94b37fd 100644
--- a/Swiften/QA/ConcurrentFileTransferTest/SConscript
+++ b/Swiften/QA/ConcurrentFileTransferTest/SConscript
@@ -3,15 +3,15 @@ import os
Import("env")
if env["TEST"] :
- myenv = env.Clone()
- myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
- myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
+ myenv = env.Clone()
+ myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
- for i in ["SWIFT_FILETRANSFERTEST_JID", "SWIFT_FILETRANSFERTEST_PASS", "SWIFT_FILETRANSFERTEST2_JID", "SWIFT_FILETRANSFERTEST2_PASS"]:
- if ARGUMENTS.get(i.lower(), False) :
- myenv["ENV"][i] = ARGUMENTS[i.lower()]
- elif os.environ.get(i, "") :
- myenv["ENV"][i] = os.environ[i]
+ for i in ["SWIFT_FILETRANSFERTEST_JID", "SWIFT_FILETRANSFERTEST_PASS", "SWIFT_FILETRANSFERTEST2_JID", "SWIFT_FILETRANSFERTEST2_PASS"]:
+ if ARGUMENTS.get(i.lower(), False) :
+ myenv["ENV"][i] = ARGUMENTS[i.lower()]
+ elif os.environ.get(i, "") :
+ myenv["ENV"][i] = os.environ[i]
- tester = myenv.Program("ConcurrentFileTransferTest", ["ConcurrentFileTransferTest.cpp"])
- myenv.Test(tester, "system")
+ tester = myenv.Program("ConcurrentFileTransferTest", ["ConcurrentFileTransferTest.cpp"])
+ myenv.Test(tester, "system")
diff --git a/Swiften/QA/DNSSDTest/SConscript b/Swiften/QA/DNSSDTest/SConscript
index d35d06f..275a314 100644
--- a/Swiften/QA/DNSSDTest/SConscript
+++ b/Swiften/QA/DNSSDTest/SConscript
@@ -3,19 +3,19 @@ import os
Import("env")
if env["TEST"] :
- myenv = env.Clone()
- myenv.MergeFlags(myenv["CHECKER_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
- myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
- myenv.MergeFlags(myenv["BOOST_FLAGS"])
- myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
- if myenv.get("HAVE_BONJOUR", 0) :
- myenv.Append(CPPDEFINES = "HAVE_BONJOUR")
- elif myenv.get("HAVE_AVAHI", 0) :
- myenv.Append(CPPDEFINES = ["HAVE_AVAHI"])
- myenv.MergeFlags(myenv["AVAHI_FLAGS"])
+ myenv = env.Clone()
+ myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+ myenv.MergeFlags(myenv["BOOST_FLAGS"])
+ myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
+ if myenv.get("HAVE_BONJOUR", 0) :
+ myenv.Append(CPPDEFINES = "HAVE_BONJOUR")
+ elif myenv.get("HAVE_AVAHI", 0) :
+ myenv.Append(CPPDEFINES = ["HAVE_AVAHI"])
+ myenv.MergeFlags(myenv["AVAHI_FLAGS"])
- tester = myenv.Program("DNSSDTest", [
- "DNSSDTest.cpp",
- ])
- myenv.Test(tester, "system")
+ tester = myenv.Program("DNSSDTest", [
+ "DNSSDTest.cpp",
+ ])
+ myenv.Test(tester, "system")
diff --git a/Swiften/QA/FileTransferTest/SConscript b/Swiften/QA/FileTransferTest/SConscript
index 3275985..4b77674 100644
--- a/Swiften/QA/FileTransferTest/SConscript
+++ b/Swiften/QA/FileTransferTest/SConscript
@@ -3,18 +3,18 @@ import os
Import("env")
if env["TEST"] :
- myenv = env.Clone()
- myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
- myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
+ myenv = env.Clone()
+ myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
- for i in ["SWIFT_FILETRANSFERTEST_JID", "SWIFT_FILETRANSFERTEST_PASS", "SWIFT_FILETRANSFERTEST2_JID", "SWIFT_FILETRANSFERTEST2_PASS"]:
- if ARGUMENTS.get(i.lower(), False) :
- myenv["ENV"][i] = ARGUMENTS[i.lower()]
- elif os.environ.get(i, "") :
- myenv["ENV"][i] = os.environ[i]
+ for i in ["SWIFT_FILETRANSFERTEST_JID", "SWIFT_FILETRANSFERTEST_PASS", "SWIFT_FILETRANSFERTEST2_JID", "SWIFT_FILETRANSFERTEST2_PASS"]:
+ if ARGUMENTS.get(i.lower(), False) :
+ myenv["ENV"][i] = ARGUMENTS[i.lower()]
+ elif os.environ.get(i, "") :
+ myenv["ENV"][i] = os.environ[i]
- # test in-band transfers, direct SOCKS5 bytestream transfers and proxied SOCKS5 bytestream transfers
- myenv["ENV"]["SWIFT_FILETRANSFERTEST_CONFIG"] = "1:1|2:2|4:4"
+ # test in-band transfers, direct SOCKS5 bytestream transfers and proxied SOCKS5 bytestream transfers
+ myenv["ENV"]["SWIFT_FILETRANSFERTEST_CONFIG"] = "1:1|2:2|4:4"
- tester = myenv.Program("FileTransferTest", ["FileTransferTest.cpp"])
- myenv.Test(tester, "system")
+ tester = myenv.Program("FileTransferTest", ["FileTransferTest.cpp"])
+ myenv.Test(tester, "system")
diff --git a/Swiften/QA/NetworkTest/SConscript b/Swiften/QA/NetworkTest/SConscript
index b090165..387bafc 100644
--- a/Swiften/QA/NetworkTest/SConscript
+++ b/Swiften/QA/NetworkTest/SConscript
@@ -3,20 +3,20 @@ import os
Import("env")
if env["TEST"] :
- myenv = env.Clone()
- if "test_ipv6" in ARGUMENTS :
- myenv.Append(CPPDEFINES = ["TEST_IPV6"])
- myenv.MergeFlags(myenv["CHECKER_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
- myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+ myenv = env.Clone()
+ if "test_ipv6" in ARGUMENTS :
+ myenv.Append(CPPDEFINES = ["TEST_IPV6"])
+ myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
+ myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
- if env.get("unbound", False) :
- myenv.Append(CPPDEFINES = ["USE_UNBOUND"])
+ if env.get("unbound", False) :
+ myenv.Append(CPPDEFINES = ["USE_UNBOUND"])
- tester = myenv.Program("NetworkTest", [
- "BoostConnectionServerTest.cpp",
- "BoostConnectionTest.cpp",
- "DomainNameResolverTest.cpp",
- ])
- myenv.Test(tester, "system", is_checker = True)
+ tester = myenv.Program("NetworkTest", [
+ "BoostConnectionServerTest.cpp",
+ "BoostConnectionTest.cpp",
+ "DomainNameResolverTest.cpp",
+ ])
+ myenv.Test(tester, "system", is_checker = True)
diff --git a/Swiften/QA/ProxyProviderTest/SConscript b/Swiften/QA/ProxyProviderTest/SConscript
index 2eb123d..3e28360 100644
--- a/Swiften/QA/ProxyProviderTest/SConscript
+++ b/Swiften/QA/ProxyProviderTest/SConscript
@@ -7,5 +7,5 @@ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
myenv.Program("ProxyProviderTest", [
- "ProxyProviderTest.cpp",
- ])
+ "ProxyProviderTest.cpp",
+ ])
diff --git a/Swiften/QA/ReconnectTest/SConscript b/Swiften/QA/ReconnectTest/SConscript
index 6db6a6f..a94af5e 100644
--- a/Swiften/QA/ReconnectTest/SConscript
+++ b/Swiften/QA/ReconnectTest/SConscript
@@ -3,23 +3,23 @@ import os
Import("env")
if env["TEST"] :
- myenv = env.Clone()
- myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
- myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
- myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
- myenv.MergeFlags(myenv["BOOST_FLAGS"])
- myenv.MergeFlags(myenv.get("SQLITE_FLAGS", ""))
- myenv.MergeFlags(myenv["ZLIB_FLAGS"])
- myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
- myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
- myenv.MergeFlags(myenv.get("EXPAT_FLAGS", ""))
- myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
-# myenv.Append(LIBPATH = ["/opt/local/lib"])
-# myenv.Append(LIBS = ["efence"])
+ myenv = env.Clone()
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+ myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
+ myenv.MergeFlags(myenv["BOOST_FLAGS"])
+ myenv.MergeFlags(myenv.get("SQLITE_FLAGS", ""))
+ myenv.MergeFlags(myenv["ZLIB_FLAGS"])
+ myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
+ myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
+ myenv.MergeFlags(myenv.get("EXPAT_FLAGS", ""))
+ myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+# myenv.Append(LIBPATH = ["/opt/local/lib"])
+# myenv.Append(LIBS = ["efence"])
- for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
- if os.environ.get(i, "") :
- myenv["ENV"][i] = os.environ[i]
+ for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
+ if os.environ.get(i, "") :
+ myenv["ENV"][i] = os.environ[i]
- tester = myenv.Program("ReconnectTest", ["ReconnectTest.cpp"])
- myenv.Test(tester, "system", is_checker = True)
+ tester = myenv.Program("ReconnectTest", ["ReconnectTest.cpp"])
+ myenv.Test(tester, "system", is_checker = True)
diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript
index 2c588e5..2bb3e51 100644
--- a/Swiften/QA/SConscript
+++ b/Swiften/QA/SConscript
@@ -1,13 +1,13 @@
Import("swiften_env")
SConscript(dirs = [
- "NetworkTest",
-# "ReconnectTest",
- "ClientTest",
-# "DNSSDTest",
- "StorageTest",
- "TLSTest",
- "ScriptedTests",
- "ProxyProviderTest",
- "FileTransferTest",
- ])
+ "NetworkTest",
+# "ReconnectTest",
+ "ClientTest",
+# "DNSSDTest",
+ "StorageTest",
+ "TLSTest",
+ "ScriptedTests",
+ "ProxyProviderTest",
+ "FileTransferTest",
+ ])
diff --git a/Swiften/QA/ScriptedTests/SConscript b/Swiften/QA/ScriptedTests/SConscript
index 298c455..ae315fe 100644
--- a/Swiften/QA/ScriptedTests/SConscript
+++ b/Swiften/QA/ScriptedTests/SConscript
@@ -1,7 +1,7 @@
Import("env")
if env["TEST"] :
- env.ScriptTests([
- "SendMessage.lua",
- "MultipleClients.lua",
- ], "Swiften.QA.ScriptedTests", "system")
+ env.ScriptTests([
+ "SendMessage.lua",
+ "MultipleClients.lua",
+ ], "Swiften.QA.ScriptedTests", "system")
diff --git a/Swiften/QA/StorageTest/SConscript b/Swiften/QA/StorageTest/SConscript
index fff2a2b..bb1a2c6 100644
--- a/Swiften/QA/StorageTest/SConscript
+++ b/Swiften/QA/StorageTest/SConscript
@@ -3,20 +3,20 @@ import os
Import("env")
if env["TEST"] :
- myenv = env.Clone()
- myenv.MergeFlags(myenv["CHECKER_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
- myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
- myenv.MergeFlags(myenv["BOOST_FLAGS"])
- myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
- myenv.MergeFlags(myenv.get("EXPAT_FLAGS", {}))
- myenv.MergeFlags(myenv.get("LIBXML_FLAGS", {}))
- myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+ myenv = env.Clone()
+ myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+ myenv.MergeFlags(myenv["BOOST_FLAGS"])
+ myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
+ myenv.MergeFlags(myenv.get("EXPAT_FLAGS", {}))
+ myenv.MergeFlags(myenv.get("LIBXML_FLAGS", {}))
+ myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
- tester = myenv.Program("StorageTest", [
- #"VCardFileStorageTest.cpp",
- "FileReadBytestreamTest.cpp",
- "FileWriteBytestreamTest.cpp",
- ])
- myenv.Test(tester, "system", is_checker = True)
+ tester = myenv.Program("StorageTest", [
+ #"VCardFileStorageTest.cpp",
+ "FileReadBytestreamTest.cpp",
+ "FileWriteBytestreamTest.cpp",
+ ])
+ myenv.Test(tester, "system", is_checker = True)
diff --git a/Swiften/QA/TLSTest/SConscript b/Swiften/QA/TLSTest/SConscript
index 1a2e2c0..ba884e4 100644
--- a/Swiften/QA/TLSTest/SConscript
+++ b/Swiften/QA/TLSTest/SConscript
@@ -3,23 +3,23 @@ import os
Import("env")
if env["TEST"] :
- myenv = env.Clone()
- myenv.MergeFlags(myenv["CHECKER_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
- myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
-
- if myenv.get("HAVE_OPENSSL", 0) :
- myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
- myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
- elif myenv.get("HAVE_SCHANNEL", 0) :
- myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
- elif myenv.get("HAVE_SECURETRANSPORT", 0) :
- myenv.Append(CPPDEFINES = "HAVE_SECURETRANSPORT")
-
- tester = myenv.Program("TLSTest", [
- "CertificateTest.cpp",
- "CertificateErrorTest.cpp"
- ])
- myenv.Test(tester, "system") \ No newline at end of file
+ myenv = env.Clone()
+ myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
+ myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+
+ if myenv.get("HAVE_OPENSSL", 0) :
+ myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
+ myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
+ elif myenv.get("HAVE_SCHANNEL", 0) :
+ myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
+ elif myenv.get("HAVE_SECURETRANSPORT", 0) :
+ myenv.Append(CPPDEFINES = "HAVE_SECURETRANSPORT")
+
+ tester = myenv.Program("TLSTest", [
+ "CertificateTest.cpp",
+ "CertificateErrorTest.cpp"
+ ])
+ myenv.Test(tester, "system") \ No newline at end of file
diff --git a/Swiften/SASL/SConscript b/Swiften/SASL/SConscript
index 7e1fd07..6aa3e72 100644
--- a/Swiften/SASL/SConscript
+++ b/Swiften/SASL/SConscript
@@ -3,31 +3,31 @@ Import("swiften_env", "env")
myenv = swiften_env.Clone()
objects = myenv.SwiftenObject([
- "ClientAuthenticator.cpp",
- "EXTERNALClientAuthenticator.cpp",
- "PLAINClientAuthenticator.cpp",
- "PLAINMessage.cpp",
- "SCRAMSHA1ClientAuthenticator.cpp",
- "DIGESTMD5Properties.cpp",
- "DIGESTMD5ClientAuthenticator.cpp",
- ])
+ "ClientAuthenticator.cpp",
+ "EXTERNALClientAuthenticator.cpp",
+ "PLAINClientAuthenticator.cpp",
+ "PLAINMessage.cpp",
+ "SCRAMSHA1ClientAuthenticator.cpp",
+ "DIGESTMD5Properties.cpp",
+ "DIGESTMD5ClientAuthenticator.cpp",
+ ])
if myenv["PLATFORM"] == "win32" :
- objects += myenv.SwiftenObject([
- "WindowsServicePrincipalName.cpp",
- "WindowsAuthentication.cpp",
- "WindowsGSSAPIClientAuthenticator.cpp"
- ])
+ objects += myenv.SwiftenObject([
+ "WindowsServicePrincipalName.cpp",
+ "WindowsAuthentication.cpp",
+ "WindowsGSSAPIClientAuthenticator.cpp"
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
env.Append(UNITTEST_SOURCES = [
- File("UnitTest/PLAINMessageTest.cpp"),
- File("UnitTest/PLAINClientAuthenticatorTest.cpp"),
- File("UnitTest/SCRAMSHA1ClientAuthenticatorTest.cpp"),
- File("UnitTest/DIGESTMD5PropertiesTest.cpp"),
- File("UnitTest/DIGESTMD5ClientAuthenticatorTest.cpp"),
- ])
+ File("UnitTest/PLAINMessageTest.cpp"),
+ File("UnitTest/PLAINClientAuthenticatorTest.cpp"),
+ File("UnitTest/SCRAMSHA1ClientAuthenticatorTest.cpp"),
+ File("UnitTest/DIGESTMD5PropertiesTest.cpp"),
+ File("UnitTest/DIGESTMD5ClientAuthenticatorTest.cpp"),
+ ])
if myenv["PLATFORM"] == "win32" :
- env.Append(UNITTEST_SOURCES = [
- File("UnitTest/WindowsServicePrincipalNameTest.cpp"),
- ])
+ env.Append(UNITTEST_SOURCES = [
+ File("UnitTest/WindowsServicePrincipalNameTest.cpp"),
+ ])
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 54ce18b..5270ac5 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -10,592 +10,592 @@ swiften_dep_modules = ["BOOST", "GCONF", "ICU", "LIBIDN", "ZLIB", "LDNS", "UNBOU
external_swiften_dep_modules = ["BOOST"]
if env["SCONS_STAGE"] == "flags" :
- env["SWIFTEN_DLL"] = env["swiften_dll"]
- env["SWIFTEN_VERSION"] = Version.getBuildVersion(env.Dir("#").abspath, "swift")
- version_match = re.match("(\d+)\.(\d+).*", env["SWIFTEN_VERSION"])
- if version_match :
- env["SWIFTEN_VERSION_MAJOR"] = int(version_match.group(1))
- env["SWIFTEN_VERSION_MINOR"] = int(version_match.group(2))
- else :
- env["SWIFTEN_VERSION_MAJOR"] = 0
- env["SWIFTEN_VERSION_MINOR"] = 0
- env["SWIFTEN_VERSION_PATCH"] = 0
- env["SWIFTEN_LIBRARY"] = "Swiften"
- env["SWIFTEN_LIBRARY_FILE"] = "Swiften"
- env["SWIFTEN_LIBRARY_ALIASES"] = []
-
- if env["SWIFTEN_DLL"] :
- if env["PLATFORM"] == "win32" :
- env["SWIFTEN_LIBRARY"] = env.subst("Swiften${SWIFTEN_VERSION_MAJOR}")
- env["SWIFTEN_LIBRARY_FILE"] = env.subst("${SWIFTEN_LIBRARY}.dll")
- elif env["PLATFORM"] == "darwin" :
- env["SWIFTEN_LIBRARY_FILE"] = env.subst("Swiften.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")
- env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.dylib", env.subst("libSwiften.${SWIFTEN_VERSION_MAJOR}.dylib")]
- else :
- env["SWIFTEN_LIBRARY_FILE"] = env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")
- env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.so", env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}")]
+ env["SWIFTEN_DLL"] = env["swiften_dll"]
+ env["SWIFTEN_VERSION"] = Version.getBuildVersion(env.Dir("#").abspath, "swift")
+ version_match = re.match("(\d+)\.(\d+).*", env["SWIFTEN_VERSION"])
+ if version_match :
+ env["SWIFTEN_VERSION_MAJOR"] = int(version_match.group(1))
+ env["SWIFTEN_VERSION_MINOR"] = int(version_match.group(2))
+ else :
+ env["SWIFTEN_VERSION_MAJOR"] = 0
+ env["SWIFTEN_VERSION_MINOR"] = 0
+ env["SWIFTEN_VERSION_PATCH"] = 0
+ env["SWIFTEN_LIBRARY"] = "Swiften"
+ env["SWIFTEN_LIBRARY_FILE"] = "Swiften"
+ env["SWIFTEN_LIBRARY_ALIASES"] = []
+
+ if env["SWIFTEN_DLL"] :
+ if env["PLATFORM"] == "win32" :
+ env["SWIFTEN_LIBRARY"] = env.subst("Swiften${SWIFTEN_VERSION_MAJOR}")
+ env["SWIFTEN_LIBRARY_FILE"] = env.subst("${SWIFTEN_LIBRARY}.dll")
+ elif env["PLATFORM"] == "darwin" :
+ env["SWIFTEN_LIBRARY_FILE"] = env.subst("Swiften.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")
+ env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.dylib", env.subst("libSwiften.${SWIFTEN_VERSION_MAJOR}.dylib")]
+ else :
+ env["SWIFTEN_LIBRARY_FILE"] = env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")
+ env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.so", env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}")]
- if env["SWIFTEN_DLL"] :
- env.AddMethod(lambda e,s : e.SharedObject(s), "SwiftenObject")
- else :
- env.AddMethod(lambda e,s : e.StaticObject(s), "SwiftenObject")
+ if env["SWIFTEN_DLL"] :
+ env.AddMethod(lambda e,s : e.SharedObject(s), "SwiftenObject")
+ else :
+ env.AddMethod(lambda e,s : e.StaticObject(s), "SwiftenObject")
- swiften_env = env.Clone()
- swiften_env["LIBPATH"] = [Dir(".")]
- swiften_env["LIBRUNPATH"] = [Dir(".")]
- swiften_env["LIBS"] = [swiften_env["SWIFTEN_LIBRARY"]]
- if not env["SWIFTEN_DLL"] :
- swiften_env.Append(CPPDEFINES = ["SWIFTEN_STATIC"])
- dep_env = env.Clone()
- for module in swiften_dep_modules :
- module_flags = env.get(module + "_FLAGS", {})
- if env.get(module + "_BUNDLED", False) :
- if module in external_swiften_dep_modules :
- swiften_env.UseFlags(module_flags)
- else :
- if module in external_swiften_dep_modules :
- dep_env.UseFlags(module_flags)
- else :
- # Expose only libraries
- dep_env.Append(LIBPATH = module_flags.get("LIBPATH", []))
- dep_env.Append(LIBS = module_flags.get("LIBS", []))
- dep_env.Append(FRAMEWORKS = module_flags.get("FRAMEWORKS", []))
- dep_env.UseFlags(dep_env["PLATFORM_FLAGS"])
+ swiften_env = env.Clone()
+ swiften_env["LIBPATH"] = [Dir(".")]
+ swiften_env["LIBRUNPATH"] = [Dir(".")]
+ swiften_env["LIBS"] = [swiften_env["SWIFTEN_LIBRARY"]]
+ if not env["SWIFTEN_DLL"] :
+ swiften_env.Append(CPPDEFINES = ["SWIFTEN_STATIC"])
+ dep_env = env.Clone()
+ for module in swiften_dep_modules :
+ module_flags = env.get(module + "_FLAGS", {})
+ if env.get(module + "_BUNDLED", False) :
+ if module in external_swiften_dep_modules :
+ swiften_env.UseFlags(module_flags)
+ else :
+ if module in external_swiften_dep_modules :
+ dep_env.UseFlags(module_flags)
+ else :
+ # Expose only libraries
+ dep_env.Append(LIBPATH = module_flags.get("LIBPATH", []))
+ dep_env.Append(LIBS = module_flags.get("LIBS", []))
+ dep_env.Append(FRAMEWORKS = module_flags.get("FRAMEWORKS", []))
+ dep_env.UseFlags(dep_env["PLATFORM_FLAGS"])
- if env.get("HAVE_SCHANNEL", 0) :
- dep_env.Append(LIBS = ["Winscard"])
+ if env.get("HAVE_SCHANNEL", 0) :
+ dep_env.Append(LIBS = ["Winscard"])
- for var, e in [("SWIFTEN_FLAGS", swiften_env), ("SWIFTEN_DEP_FLAGS", dep_env)] :
- env[var] = {
- "CPPDEFINES": e.get("CPPDEFINES", []),
- "CPPPATH": e.get("CPPPATH", []),
- "CPPFLAGS": e.get("CPPFLAGS", []),
- "LIBPATH": e.get("LIBPATH", []),
- "LIBRUNPATH": e.get("LIBRUNPATH", []),
- "LIBS": e.get("LIBS", []),
- "FRAMEWORKS": e.get("FRAMEWORKS", []),
- }
+ for var, e in [("SWIFTEN_FLAGS", swiften_env), ("SWIFTEN_DEP_FLAGS", dep_env)] :
+ env[var] = {
+ "CPPDEFINES": e.get("CPPDEFINES", []),
+ "CPPPATH": e.get("CPPPATH", []),
+ "CPPFLAGS": e.get("CPPFLAGS", []),
+ "LIBPATH": e.get("LIBPATH", []),
+ "LIBRUNPATH": e.get("LIBRUNPATH", []),
+ "LIBS": e.get("LIBS", []),
+ "FRAMEWORKS": e.get("FRAMEWORKS", []),
+ }
- if env["PLATFORM"] == "win32" :
- # 0x0600 = _WIN32_WINNT_VISTA, 0x06000000 = NTDDI_VISTA
- env.Append(CPPDEFINES = [("_WIN32_WINNT","0x0600") , ("NTDDI_VERSION","0x06000000")])
+ if env["PLATFORM"] == "win32" :
+ # 0x0600 = _WIN32_WINNT_VISTA, 0x06000000 = NTDDI_VISTA
+ env.Append(CPPDEFINES = [("_WIN32_WINNT","0x0600") , ("NTDDI_VERSION","0x06000000")])
################################################################################
# Build
################################################################################
if env["SCONS_STAGE"] == "build" :
- swiften_env = env.Clone()
- swiften_env.Append(CPPDEFINES = ["SWIFTEN_BUILDING"])
- for module in swiften_dep_modules :
- swiften_env.UseFlags(swiften_env.get(module + "_FLAGS", {}))
- if env.get(module + "_BUNDLED", False) :
- swiften_env.Append(SWIFTEN_OBJECTS = env.get(module + "_OBJECTS", []))
- swiften_env.UseFlags(swiften_env["PLATFORM_FLAGS"])
-
- if swiften_env["SWIFTEN_DLL"] :
- swiften_env.AddMethod(lambda e,l,o : e.SharedLibrary(l,o), "SwiftenLibrary")
- else :
- swiften_env.Append(CPPDEFINES = ["SWIFTEN_STATIC"])
- swiften_env.AddMethod(lambda e,l,o : e.StaticLibrary(l,o), "SwiftenLibrary")
- Export("swiften_env")
+ swiften_env = env.Clone()
+ swiften_env.Append(CPPDEFINES = ["SWIFTEN_BUILDING"])
+ for module in swiften_dep_modules :
+ swiften_env.UseFlags(swiften_env.get(module + "_FLAGS", {}))
+ if env.get(module + "_BUNDLED", False) :
+ swiften_env.Append(SWIFTEN_OBJECTS = env.get(module + "_OBJECTS", []))
+ swiften_env.UseFlags(swiften_env["PLATFORM_FLAGS"])
+
+ if swiften_env["SWIFTEN_DLL"] :
+ swiften_env.AddMethod(lambda e,l,o : e.SharedLibrary(l,o), "SwiftenLibrary")
+ else :
+ swiften_env.Append(CPPDEFINES = ["SWIFTEN_STATIC"])
+ swiften_env.AddMethod(lambda e,l,o : e.StaticLibrary(l,o), "SwiftenLibrary")
+ Export("swiften_env")
# TODO: Move all this to a submodule SConscript
- sources = [
- "Base/Debug.cpp",
- "Chat/ChatStateTracker.cpp",
- "Chat/ChatStateNotifier.cpp",
- "Client/ClientSessionStanzaChannel.cpp",
- "Client/CoreClient.cpp",
- "Client/Client.cpp",
- "Client/ClientXMLTracer.cpp",
- "Client/ClientSession.cpp",
- "Client/BlockList.cpp",
- "Client/BlockListImpl.cpp",
- "Client/ClientBlockListManager.cpp",
- "Client/MemoryStorages.cpp",
- "Client/NickResolver.cpp",
- "Client/NickManager.cpp",
- "Client/NickManagerImpl.cpp",
- "Client/Storages.cpp",
- "Client/XMLBeautifier.cpp",
- "Compress/ZLibCodecompressor.cpp",
- "Compress/ZLibDecompressor.cpp",
- "Compress/ZLibCompressor.cpp",
- "Elements/CarbonsEnable.cpp",
- "Elements/CarbonsDisable.cpp",
- "Elements/CarbonsPrivate.cpp",
- "Elements/CarbonsReceived.cpp",
- "Elements/CarbonsSent.cpp",
- "Elements/DiscoInfo.cpp",
- "Elements/Presence.cpp",
- "Elements/Form.cpp",
- "Elements/FormField.cpp",
- "Elements/FormPage.cpp",
- "Elements/FormSection.cpp",
- "Elements/FormText.cpp",
- "Elements/StreamFeatures.cpp",
- "Elements/Element.cpp",
- "Elements/ToplevelElement.cpp",
- "Elements/IQ.cpp",
- "Elements/Payload.cpp",
- "Elements/PubSubPayload.cpp",
- "Elements/PubSubOwnerPayload.cpp",
- "Elements/PubSubEventPayload.cpp",
- "Elements/RosterItemExchangePayload.cpp",
- "Elements/RosterPayload.cpp",
- "Elements/SecurityLabel.cpp",
- "Elements/Stanza.cpp",
- "Elements/StanzaAck.cpp",
- "Elements/StatusShow.cpp",
- "Elements/StreamManagementEnabled.cpp",
- "Elements/StreamResume.cpp",
- "Elements/StreamResumed.cpp",
- "Elements/UserLocation.cpp",
- "Elements/UserTune.cpp",
- "Elements/VCard.cpp",
- "Elements/MUCOccupant.cpp",
- "Elements/ResultSet.cpp",
- "Elements/Forwarded.cpp",
- "Elements/MAMResult.cpp",
- "Elements/MAMQuery.cpp",
- "Elements/MAMFin.cpp",
- "Elements/Thread.cpp",
- "Elements/IsodeIQDelegation.cpp",
- "Entity/Entity.cpp",
- "Entity/PayloadPersister.cpp",
- "MUC/MUC.cpp",
- "MUC/MUCImpl.cpp",
- "MUC/MUCManager.cpp",
- "MUC/MUCRegistry.cpp",
- "MUC/MUCBookmarkManager.cpp",
- "PubSub/PubSubManager.cpp",
- "PubSub/PubSubManagerImpl.cpp",
- "Queries/IQChannel.cpp",
- "Queries/IQHandler.cpp",
- "Queries/IQRouter.cpp",
- "Queries/Request.cpp",
- "Queries/Responders/SoftwareVersionResponder.cpp",
- "Roster/RosterStorage.cpp",
- "Roster/RosterMemoryStorage.cpp",
- "Roster/XMPPRoster.cpp",
- "Roster/XMPPRosterImpl.cpp",
- "Roster/XMPPRosterController.cpp",
- "Serializer/AuthRequestSerializer.cpp",
- "Serializer/AuthSuccessSerializer.cpp",
- "Serializer/AuthChallengeSerializer.cpp",
- "Serializer/AuthResponseSerializer.cpp",
- "Serializer/CompressRequestSerializer.cpp",
- "Serializer/ElementSerializer.cpp",
- "Serializer/MessageSerializer.cpp",
- "Serializer/StreamManagementEnabledSerializer.cpp",
- "Serializer/StreamResumeSerializer.cpp",
- "Serializer/StreamResumedSerializer.cpp",
- "Serializer/ComponentHandshakeSerializer.cpp",
- "Serializer/PayloadSerializer.cpp",
- "Serializer/PayloadSerializerCollection.cpp",
- "Serializer/PayloadSerializers/IBBSerializer.cpp",
- "Serializer/PayloadSerializers/CapsInfoSerializer.cpp",
- "Serializer/PayloadSerializers/CarbonsDisableSerializer.cpp",
- "Serializer/PayloadSerializers/CarbonsEnableSerializer.cpp",
- "Serializer/PayloadSerializers/CarbonsPrivateSerializer.cpp",
- "Serializer/PayloadSerializers/CarbonsSentSerializer.cpp",
- "Serializer/PayloadSerializers/CarbonsReceivedSerializer.cpp",
- "Serializer/PayloadSerializers/ChatStateSerializer.cpp",
- "Serializer/PayloadSerializers/DiscoInfoSerializer.cpp",
- "Serializer/PayloadSerializers/DiscoItemsSerializer.cpp",
- "Serializer/PayloadSerializers/ErrorSerializer.cpp",
- "Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp",
- "Serializer/PayloadSerializers/MUCPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/MUCAdminPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/MUCOwnerPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/MUCInvitationPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/ResourceBindSerializer.cpp",
- "Serializer/PayloadSerializers/RosterItemExchangeSerializer.cpp",
- "Serializer/PayloadSerializers/RosterSerializer.cpp",
- "Serializer/PayloadSerializers/SecurityLabelSerializer.cpp",
- "Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp",
- "Serializer/PayloadSerializers/SoftwareVersionSerializer.cpp",
- "Serializer/PayloadSerializers/StreamInitiationSerializer.cpp",
- "Serializer/PayloadSerializers/BytestreamsSerializer.cpp",
- "Serializer/PayloadSerializers/VCardSerializer.cpp",
- "Serializer/PayloadSerializers/VCardUpdateSerializer.cpp",
- "Serializer/PayloadSerializers/StorageSerializer.cpp",
- "Serializer/PayloadSerializers/PrivateStorageSerializer.cpp",
- "Serializer/PayloadSerializers/DelaySerializer.cpp",
- "Serializer/PayloadSerializers/CommandSerializer.cpp",
- "Serializer/PayloadSerializers/InBandRegistrationPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/SearchPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/FormSerializer.cpp",
- "Serializer/PayloadSerializers/NicknameSerializer.cpp",
- "Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.cpp",
- "Serializer/PayloadSerializers/JinglePayloadSerializer.cpp",
- "Serializer/PayloadSerializers/JingleContentPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/JingleFileTransferHashSerializer.cpp",
- "Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.cpp",
- "Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.cpp",
- "Serializer/PayloadSerializers/DeliveryReceiptSerializer.cpp",
- "Serializer/PayloadSerializers/DeliveryReceiptRequestSerializer.cpp",
- "Serializer/PayloadSerializers/UserLocationSerializer.cpp",
- "Serializer/PayloadSerializers/UserTuneSerializer.cpp",
- "Serializer/PayloadSerializers/WhiteboardSerializer.cpp",
- "Serializer/PayloadSerializers/ResultSetSerializer.cpp",
- "Serializer/PayloadSerializers/ForwardedSerializer.cpp",
- "Serializer/PayloadSerializers/MAMFinSerializer.cpp",
- "Serializer/PayloadSerializers/MAMResultSerializer.cpp",
- "Serializer/PayloadSerializers/MAMQuerySerializer.cpp",
- "Serializer/PayloadSerializers/IsodeIQDelegationSerializer.cpp",
- "Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.cpp",
- "Serializer/PayloadSerializers/ThreadSerializer.cpp",
- "Serializer/PresenceSerializer.cpp",
- "Serializer/StanzaSerializer.cpp",
- "Serializer/StreamErrorSerializer.cpp",
- "Serializer/StreamFeaturesSerializer.cpp",
- "Serializer/XML/XMLElement.cpp",
- "Serializer/XML/XMLNode.cpp",
- "Serializer/XMPPSerializer.cpp",
- "Session/Session.cpp",
- "Session/SessionTracer.cpp",
- "Session/SessionStream.cpp",
- "Session/BasicSessionStream.cpp",
- "Session/BOSHSessionStream.cpp",
- "StringCodecs/Base64.cpp",
- "StringCodecs/Hexify.cpp",
- "Whiteboard/WhiteboardResponder.cpp",
- "Whiteboard/WhiteboardSession.cpp",
- "Whiteboard/IncomingWhiteboardSession.cpp",
- "Whiteboard/OutgoingWhiteboardSession.cpp",
- "Whiteboard/WhiteboardSessionManager.cpp",
- "Whiteboard/WhiteboardServer.cpp",
- "Whiteboard/WhiteboardClient.cpp",
- "Elements/Whiteboard/WhiteboardColor.cpp",
- "Whiteboard/WhiteboardTransformer.cpp",
- ]
-
- elements = [
- "PubSub", "PubSubAffiliations", "PubSubAffiliation", "PubSubConfigure", "PubSubCreate", "PubSubDefault",
- "PubSubItems", "PubSubItem", "PubSubOptions", "PubSubPublish", "PubSubRetract", "PubSubSubscribeOptions",
- "PubSubSubscribe", "PubSubSubscriptions", "PubSubSubscription", "PubSubUnsubscribe",
+ sources = [
+ "Base/Debug.cpp",
+ "Chat/ChatStateTracker.cpp",
+ "Chat/ChatStateNotifier.cpp",
+ "Client/ClientSessionStanzaChannel.cpp",
+ "Client/CoreClient.cpp",
+ "Client/Client.cpp",
+ "Client/ClientXMLTracer.cpp",
+ "Client/ClientSession.cpp",
+ "Client/BlockList.cpp",
+ "Client/BlockListImpl.cpp",
+ "Client/ClientBlockListManager.cpp",
+ "Client/MemoryStorages.cpp",
+ "Client/NickResolver.cpp",
+ "Client/NickManager.cpp",
+ "Client/NickManagerImpl.cpp",
+ "Client/Storages.cpp",
+ "Client/XMLBeautifier.cpp",
+ "Compress/ZLibCodecompressor.cpp",
+ "Compress/ZLibDecompressor.cpp",
+ "Compress/ZLibCompressor.cpp",
+ "Elements/CarbonsEnable.cpp",
+ "Elements/CarbonsDisable.cpp",
+ "Elements/CarbonsPrivate.cpp",
+ "Elements/CarbonsReceived.cpp",
+ "Elements/CarbonsSent.cpp",
+ "Elements/DiscoInfo.cpp",
+ "Elements/Presence.cpp",
+ "Elements/Form.cpp",
+ "Elements/FormField.cpp",
+ "Elements/FormPage.cpp",
+ "Elements/FormSection.cpp",
+ "Elements/FormText.cpp",
+ "Elements/StreamFeatures.cpp",
+ "Elements/Element.cpp",
+ "Elements/ToplevelElement.cpp",
+ "Elements/IQ.cpp",
+ "Elements/Payload.cpp",
+ "Elements/PubSubPayload.cpp",
+ "Elements/PubSubOwnerPayload.cpp",
+ "Elements/PubSubEventPayload.cpp",
+ "Elements/RosterItemExchangePayload.cpp",
+ "Elements/RosterPayload.cpp",
+ "Elements/SecurityLabel.cpp",
+ "Elements/Stanza.cpp",
+ "Elements/StanzaAck.cpp",
+ "Elements/StatusShow.cpp",
+ "Elements/StreamManagementEnabled.cpp",
+ "Elements/StreamResume.cpp",
+ "Elements/StreamResumed.cpp",
+ "Elements/UserLocation.cpp",
+ "Elements/UserTune.cpp",
+ "Elements/VCard.cpp",
+ "Elements/MUCOccupant.cpp",
+ "Elements/ResultSet.cpp",
+ "Elements/Forwarded.cpp",
+ "Elements/MAMResult.cpp",
+ "Elements/MAMQuery.cpp",
+ "Elements/MAMFin.cpp",
+ "Elements/Thread.cpp",
+ "Elements/IsodeIQDelegation.cpp",
+ "Entity/Entity.cpp",
+ "Entity/PayloadPersister.cpp",
+ "MUC/MUC.cpp",
+ "MUC/MUCImpl.cpp",
+ "MUC/MUCManager.cpp",
+ "MUC/MUCRegistry.cpp",
+ "MUC/MUCBookmarkManager.cpp",
+ "PubSub/PubSubManager.cpp",
+ "PubSub/PubSubManagerImpl.cpp",
+ "Queries/IQChannel.cpp",
+ "Queries/IQHandler.cpp",
+ "Queries/IQRouter.cpp",
+ "Queries/Request.cpp",
+ "Queries/Responders/SoftwareVersionResponder.cpp",
+ "Roster/RosterStorage.cpp",
+ "Roster/RosterMemoryStorage.cpp",
+ "Roster/XMPPRoster.cpp",
+ "Roster/XMPPRosterImpl.cpp",
+ "Roster/XMPPRosterController.cpp",
+ "Serializer/AuthRequestSerializer.cpp",
+ "Serializer/AuthSuccessSerializer.cpp",
+ "Serializer/AuthChallengeSerializer.cpp",
+ "Serializer/AuthResponseSerializer.cpp",
+ "Serializer/CompressRequestSerializer.cpp",
+ "Serializer/ElementSerializer.cpp",
+ "Serializer/MessageSerializer.cpp",
+ "Serializer/StreamManagementEnabledSerializer.cpp",
+ "Serializer/StreamResumeSerializer.cpp",
+ "Serializer/StreamResumedSerializer.cpp",
+ "Serializer/ComponentHandshakeSerializer.cpp",
+ "Serializer/PayloadSerializer.cpp",
+ "Serializer/PayloadSerializerCollection.cpp",
+ "Serializer/PayloadSerializers/IBBSerializer.cpp",
+ "Serializer/PayloadSerializers/CapsInfoSerializer.cpp",
+ "Serializer/PayloadSerializers/CarbonsDisableSerializer.cpp",
+ "Serializer/PayloadSerializers/CarbonsEnableSerializer.cpp",
+ "Serializer/PayloadSerializers/CarbonsPrivateSerializer.cpp",
+ "Serializer/PayloadSerializers/CarbonsSentSerializer.cpp",
+ "Serializer/PayloadSerializers/CarbonsReceivedSerializer.cpp",
+ "Serializer/PayloadSerializers/ChatStateSerializer.cpp",
+ "Serializer/PayloadSerializers/DiscoInfoSerializer.cpp",
+ "Serializer/PayloadSerializers/DiscoItemsSerializer.cpp",
+ "Serializer/PayloadSerializers/ErrorSerializer.cpp",
+ "Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp",
+ "Serializer/PayloadSerializers/MUCPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/MUCAdminPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/MUCOwnerPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/MUCInvitationPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/ResourceBindSerializer.cpp",
+ "Serializer/PayloadSerializers/RosterItemExchangeSerializer.cpp",
+ "Serializer/PayloadSerializers/RosterSerializer.cpp",
+ "Serializer/PayloadSerializers/SecurityLabelSerializer.cpp",
+ "Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp",
+ "Serializer/PayloadSerializers/SoftwareVersionSerializer.cpp",
+ "Serializer/PayloadSerializers/StreamInitiationSerializer.cpp",
+ "Serializer/PayloadSerializers/BytestreamsSerializer.cpp",
+ "Serializer/PayloadSerializers/VCardSerializer.cpp",
+ "Serializer/PayloadSerializers/VCardUpdateSerializer.cpp",
+ "Serializer/PayloadSerializers/StorageSerializer.cpp",
+ "Serializer/PayloadSerializers/PrivateStorageSerializer.cpp",
+ "Serializer/PayloadSerializers/DelaySerializer.cpp",
+ "Serializer/PayloadSerializers/CommandSerializer.cpp",
+ "Serializer/PayloadSerializers/InBandRegistrationPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/SearchPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/FormSerializer.cpp",
+ "Serializer/PayloadSerializers/NicknameSerializer.cpp",
+ "Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.cpp",
+ "Serializer/PayloadSerializers/JinglePayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/JingleContentPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/JingleFileTransferHashSerializer.cpp",
+ "Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.cpp",
+ "Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.cpp",
+ "Serializer/PayloadSerializers/DeliveryReceiptSerializer.cpp",
+ "Serializer/PayloadSerializers/DeliveryReceiptRequestSerializer.cpp",
+ "Serializer/PayloadSerializers/UserLocationSerializer.cpp",
+ "Serializer/PayloadSerializers/UserTuneSerializer.cpp",
+ "Serializer/PayloadSerializers/WhiteboardSerializer.cpp",
+ "Serializer/PayloadSerializers/ResultSetSerializer.cpp",
+ "Serializer/PayloadSerializers/ForwardedSerializer.cpp",
+ "Serializer/PayloadSerializers/MAMFinSerializer.cpp",
+ "Serializer/PayloadSerializers/MAMResultSerializer.cpp",
+ "Serializer/PayloadSerializers/MAMQuerySerializer.cpp",
+ "Serializer/PayloadSerializers/IsodeIQDelegationSerializer.cpp",
+ "Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.cpp",
+ "Serializer/PayloadSerializers/ThreadSerializer.cpp",
+ "Serializer/PresenceSerializer.cpp",
+ "Serializer/StanzaSerializer.cpp",
+ "Serializer/StreamErrorSerializer.cpp",
+ "Serializer/StreamFeaturesSerializer.cpp",
+ "Serializer/XML/XMLElement.cpp",
+ "Serializer/XML/XMLNode.cpp",
+ "Serializer/XMPPSerializer.cpp",
+ "Session/Session.cpp",
+ "Session/SessionTracer.cpp",
+ "Session/SessionStream.cpp",
+ "Session/BasicSessionStream.cpp",
+ "Session/BOSHSessionStream.cpp",
+ "StringCodecs/Base64.cpp",
+ "StringCodecs/Hexify.cpp",
+ "Whiteboard/WhiteboardResponder.cpp",
+ "Whiteboard/WhiteboardSession.cpp",
+ "Whiteboard/IncomingWhiteboardSession.cpp",
+ "Whiteboard/OutgoingWhiteboardSession.cpp",
+ "Whiteboard/WhiteboardSessionManager.cpp",
+ "Whiteboard/WhiteboardServer.cpp",
+ "Whiteboard/WhiteboardClient.cpp",
+ "Elements/Whiteboard/WhiteboardColor.cpp",
+ "Whiteboard/WhiteboardTransformer.cpp",
+ ]
+
+ elements = [
+ "PubSub", "PubSubAffiliations", "PubSubAffiliation", "PubSubConfigure", "PubSubCreate", "PubSubDefault",
+ "PubSubItems", "PubSubItem", "PubSubOptions", "PubSubPublish", "PubSubRetract", "PubSubSubscribeOptions",
+ "PubSubSubscribe", "PubSubSubscriptions", "PubSubSubscription", "PubSubUnsubscribe",
- "PubSubEvent", "PubSubEventAssociate", "PubSubEventCollection", "PubSubEventConfiguration", "PubSubEventDelete",
- "PubSubEventDisassociate", "PubSubEventItem", "PubSubEventItems", "PubSubEventPurge", "PubSubEventRedirect",
- "PubSubEventRetract", "PubSubEventSubscription",
+ "PubSubEvent", "PubSubEventAssociate", "PubSubEventCollection", "PubSubEventConfiguration", "PubSubEventDelete",
+ "PubSubEventDisassociate", "PubSubEventItem", "PubSubEventItems", "PubSubEventPurge", "PubSubEventRedirect",
+ "PubSubEventRetract", "PubSubEventSubscription",
- "PubSubOwnerAffiliation", "PubSubOwnerAffiliations", "PubSubOwnerConfigure", "PubSubOwnerDefault",
- "PubSubOwnerDelete", "PubSubOwnerPubSub", "PubSubOwnerPurge", "PubSubOwnerRedirect",
- "PubSubOwnerSubscription", "PubSubOwnerSubscriptions",
+ "PubSubOwnerAffiliation", "PubSubOwnerAffiliations", "PubSubOwnerConfigure", "PubSubOwnerDefault",
+ "PubSubOwnerDelete", "PubSubOwnerPubSub", "PubSubOwnerPurge", "PubSubOwnerRedirect",
+ "PubSubOwnerSubscription", "PubSubOwnerSubscriptions",
- "PubSubError",
- ]
- for element in elements :
- sources += [
- "Elements/" + element + ".cpp",
- "Serializer/PayloadSerializers/" + element + "Serializer.cpp",
- "Parser/PayloadParsers/" + element + "Parser.cpp",
- ]
+ "PubSubError",
+ ]
+ for element in elements :
+ sources += [
+ "Elements/" + element + ".cpp",
+ "Serializer/PayloadSerializers/" + element + "Serializer.cpp",
+ "Parser/PayloadParsers/" + element + "Parser.cpp",
+ ]
- SConscript(dirs = [
- "Avatars",
- "Base",
- "IDN",
- "SASL",
- "TLS",
- "Crypto",
- "EventLoop",
- "Parser",
- "JID",
- "Jingle",
- "Disco",
- "VCards",
- "Network",
- "Presence",
- "FileTransfer",
- "History",
- "StreamStack",
- "LinkLocal",
- "StreamManagement",
- "Component",
- "AdHoc"
- ])
- if env["build_examples"] :
- SConscript(dirs = [
- "Config",
- "Examples"
- ])
- env.SConscript(test_only = True, dirs = [
- "QA",
- ])
+ SConscript(dirs = [
+ "Avatars",
+ "Base",
+ "IDN",
+ "SASL",
+ "TLS",
+ "Crypto",
+ "EventLoop",
+ "Parser",
+ "JID",
+ "Jingle",
+ "Disco",
+ "VCards",
+ "Network",
+ "Presence",
+ "FileTransfer",
+ "History",
+ "StreamStack",
+ "LinkLocal",
+ "StreamManagement",
+ "Component",
+ "AdHoc"
+ ])
+ if env["build_examples"] :
+ SConscript(dirs = [
+ "Config",
+ "Examples"
+ ])
+ env.SConscript(test_only = True, dirs = [
+ "QA",
+ ])
- myenv = swiften_env.Clone()
- if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) :
- env.MergeFlags(env["GCONF_FLAGS"])
+ myenv = swiften_env.Clone()
+ if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) :
+ env.MergeFlags(env["GCONF_FLAGS"])
- if myenv["SWIFTEN_DLL"] :
- if myenv["PLATFORM"] == "posix" :
- myenv.Append(LINKFLAGS = ["-Wl,-soname,libSwiften.so.$SWIFTEN_VERSION_MAJOR"])
- myenv["SHLIBSUFFIX"] = ""
- elif myenv["PLATFORM"] == "darwin" :
- myenv.Append(LINKFLAGS = ["-Wl,-install_name,${SHLIBPREFIX}Swiften.${SWIFTEN_VERSION_MAJOR}${SHLIBSUFFIX}", "-Wl,-compatibility_version,${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}", "-Wl,-current_version,${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}"])
- elif myenv["PLATFORM"] == "win32" :
- res_env = myenv.Clone()
- res_env.Append(CPPDEFINES = [
- ("SWIFTEN_LIBRARY_FILE", "\"\\\"${SWIFTEN_LIBRARY_FILE}\\\"\""),
- ("SWIFTEN_COPYRIGHT_YEAR", "\"\\\"2010-%s\\\"\"" % str(time.localtime()[0])),
- ("SWIFTEN_VERSION_MAJOR", "${SWIFTEN_VERSION_MAJOR}"),
- ("SWIFTEN_VERSION_MINOR", "${SWIFTEN_VERSION_MINOR}"),
- ("SWIFTEN_VERSION_PATCH", "${SWIFTEN_VERSION_PATCH}"),
- ])
- res = res_env.RES("Swiften.rc")
- # For some reason, SCons isn't picking up the dependency correctly
- # Adding it explicitly until i figure out why
- res_env.Depends(res, "Version.h")
- sources += res
+ if myenv["SWIFTEN_DLL"] :
+ if myenv["PLATFORM"] == "posix" :
+ myenv.Append(LINKFLAGS = ["-Wl,-soname,libSwiften.so.$SWIFTEN_VERSION_MAJOR"])
+ myenv["SHLIBSUFFIX"] = ""
+ elif myenv["PLATFORM"] == "darwin" :
+ myenv.Append(LINKFLAGS = ["-Wl,-install_name,${SHLIBPREFIX}Swiften.${SWIFTEN_VERSION_MAJOR}${SHLIBSUFFIX}", "-Wl,-compatibility_version,${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}", "-Wl,-current_version,${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}"])
+ elif myenv["PLATFORM"] == "win32" :
+ res_env = myenv.Clone()
+ res_env.Append(CPPDEFINES = [
+ ("SWIFTEN_LIBRARY_FILE", "\"\\\"${SWIFTEN_LIBRARY_FILE}\\\"\""),
+ ("SWIFTEN_COPYRIGHT_YEAR", "\"\\\"2010-%s\\\"\"" % str(time.localtime()[0])),
+ ("SWIFTEN_VERSION_MAJOR", "${SWIFTEN_VERSION_MAJOR}"),
+ ("SWIFTEN_VERSION_MINOR", "${SWIFTEN_VERSION_MINOR}"),
+ ("SWIFTEN_VERSION_PATCH", "${SWIFTEN_VERSION_PATCH}"),
+ ])
+ res = res_env.RES("Swiften.rc")
+ # For some reason, SCons isn't picking up the dependency correctly
+ # Adding it explicitly until i figure out why
+ res_env.Depends(res, "Version.h")
+ sources += res
- swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_FILE"], sources + swiften_env["SWIFTEN_OBJECTS"])
- def symlink(env, target, source) :
- if os.path.exists(str(target[0])) :
- os.unlink(str(target[0]))
- os.symlink(source[0].get_contents(), str(target[0]))
- for alias in myenv["SWIFTEN_LIBRARY_ALIASES"] :
- myenv.Command(myenv.File(alias), [myenv.Value(swiften_lib[0].name), swiften_lib[0]], symlink)
+ swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_FILE"], sources + swiften_env["SWIFTEN_OBJECTS"])
+ def symlink(env, target, source) :
+ if os.path.exists(str(target[0])) :
+ os.unlink(str(target[0]))
+ os.symlink(source[0].get_contents(), str(target[0]))
+ for alias in myenv["SWIFTEN_LIBRARY_ALIASES"] :
+ myenv.Command(myenv.File(alias), [myenv.Value(swiften_lib[0].name), swiften_lib[0]], symlink)
- env.Append(UNITTEST_SOURCES = [
- File("Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp"),
- File("Avatars/UnitTest/VCardAvatarManagerTest.cpp"),
- File("Avatars/UnitTest/CombinedAvatarProviderTest.cpp"),
- File("Avatars/UnitTest/AvatarManagerImplTest.cpp"),
- File("Base/UnitTest/IDGeneratorTest.cpp"),
- File("Base/UnitTest/SimpleIDGeneratorTest.cpp"),
- File("Base/UnitTest/StringTest.cpp"),
- File("Base/UnitTest/DateTimeTest.cpp"),
- File("Base/UnitTest/ByteArrayTest.cpp"),
- File("Base/UnitTest/URLTest.cpp"),
- File("Base/UnitTest/PathTest.cpp"),
- File("Chat/UnitTest/ChatStateNotifierTest.cpp"),
-# File("Chat/UnitTest/ChatStateTrackerTest.cpp"),
- File("Client/UnitTest/ClientSessionTest.cpp"),
- File("Client/UnitTest/NickResolverTest.cpp"),
- File("Client/UnitTest/ClientBlockListManagerTest.cpp"),
- File("Client/UnitTest/BlockListImplTest.cpp"),
- File("Compress/UnitTest/ZLibCompressorTest.cpp"),
- File("Compress/UnitTest/ZLibDecompressorTest.cpp"),
- File("Component/UnitTest/ComponentHandshakeGeneratorTest.cpp"),
- File("Component/UnitTest/ComponentConnectorTest.cpp"),
- File("Component/UnitTest/ComponentSessionTest.cpp"),
- File("Disco/UnitTest/CapsInfoGeneratorTest.cpp"),
- File("Disco/UnitTest/CapsManagerTest.cpp"),
- File("Disco/UnitTest/EntityCapsManagerTest.cpp"),
- File("Disco/UnitTest/JIDDiscoInfoResponderTest.cpp"),
- File("Disco/UnitTest/DiscoInfoResponderTest.cpp"),
- File("Elements/UnitTest/IQTest.cpp"),
- File("Elements/UnitTest/StanzaTest.cpp"),
- File("Elements/UnitTest/FormTest.cpp"),
- File("EventLoop/UnitTest/EventLoopTest.cpp"),
- File("EventLoop/UnitTest/SimpleEventLoopTest.cpp"),
-# File("History/UnitTest/SQLiteHistoryManagerTest.cpp"),
- File("JID/UnitTest/JIDTest.cpp"),
- File("LinkLocal/UnitTest/LinkLocalConnectorTest.cpp"),
- File("LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp"),
- File("LinkLocal/UnitTest/LinkLocalServiceInfoTest.cpp"),
- File("LinkLocal/UnitTest/LinkLocalServiceTest.cpp"),
- File("MUC/UnitTest/MUCTest.cpp"),
- File("MUC/UnitTest/MockMUC.cpp"),
- File("Network/UnitTest/HostAddressTest.cpp"),
- File("Network/UnitTest/ConnectorTest.cpp"),
- File("Network/UnitTest/ChainedConnectorTest.cpp"),
- File("Network/UnitTest/DomainNameServiceQueryTest.cpp"),
- File("Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp"),
- File("Network/UnitTest/BOSHConnectionTest.cpp"),
- File("Network/UnitTest/BOSHConnectionPoolTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/BlockParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/BodyParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/DiscoInfoParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/DiscoItemsParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/FormParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/CommandParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/PriorityParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/ResourceBindParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/RosterItemExchangeParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/RosterParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/IBBParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/InBandRegistrationPayloadParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/JingleParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/SearchPayloadParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/SecurityLabelParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/SecurityLabelsCatalogParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/SoftwareVersionParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/StatusParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/StatusShowParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/StreamInitiationParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/VCardParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/StorageParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/PrivateStorageParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/VCardUpdateParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/ReplaceTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/MUCAdminPayloadParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/MUCUserPayloadParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/DeliveryReceiptParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/IdleParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/MAMFinParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/MAMResultParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/MAMQueryParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/CarbonsParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/UserTuneParserTest.cpp"),
- File("Parser/PayloadParsers/UnitTest/UserLocationParserTest.cpp"),
- File("Parser/UnitTest/BOSHBodyExtractorTest.cpp"),
- File("Parser/UnitTest/AttributeMapTest.cpp"),
- File("Parser/UnitTest/EnumParserTest.cpp"),
- File("Parser/UnitTest/IQParserTest.cpp"),
- File("Parser/UnitTest/GenericPayloadTreeParserTest.cpp"),
- File("Parser/UnitTest/MessageParserTest.cpp"),
- File("Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp"),
- File("Parser/UnitTest/PresenceParserTest.cpp"),
- File("Parser/UnitTest/StanzaAckParserTest.cpp"),
- File("Parser/UnitTest/SerializingParserTest.cpp"),
- File("Parser/UnitTest/StanzaParserTest.cpp"),
- File("Parser/UnitTest/StreamFeaturesParserTest.cpp"),
- File("Parser/UnitTest/StreamManagementEnabledParserTest.cpp"),
- File("Parser/UnitTest/XMLParserTest.cpp"),
- File("Parser/UnitTest/XMPPParserTest.cpp"),
- File("Presence/UnitTest/PresenceOracleTest.cpp"),
- File("Presence/UnitTest/DirectedPresenceSenderTest.cpp"),
- File("Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp"),
- File("Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp"),
- File("Queries/UnitTest/IQRouterTest.cpp"),
- File("Queries/UnitTest/RequestTest.cpp"),
- File("Queries/UnitTest/ResponderTest.cpp"),
- File("Roster/UnitTest/XMPPRosterImplTest.cpp"),
- File("Roster/UnitTest/XMPPRosterControllerTest.cpp"),
- File("Roster/UnitTest/XMPPRosterSignalHandler.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/PayloadsSerializer.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/BlockSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/CarbonsSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/CapsInfoSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/ChatStateSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/FormSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/ErrorSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/IBBSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/PrioritySerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/ResourceBindSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/RosterSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/SearchPayloadSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/SecurityLabelSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/SecurityLabelsCatalogSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/SoftwareVersionSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/StatusSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/StatusShowSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/StreamInitiationSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/InBandRegistrationPayloadSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/IsodeIQDelegationSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/VCardUpdateSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/VCardSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/StorageSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/ReplaceSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/MUCAdminPayloadSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/JingleSerializersTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/DeliveryReceiptSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/IdleSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/ForwardedSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/MAMFinSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/MAMResultSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/PubSubItemSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/UserTuneSerializerTest.cpp"),
- File("Serializer/PayloadSerializers/UnitTest/UserLocationSerializerTest.cpp"),
- File("Serializer/UnitTest/StreamFeaturesSerializerTest.cpp"),
- File("Serializer/UnitTest/AuthSuccessSerializerTest.cpp"),
- File("Serializer/UnitTest/AuthChallengeSerializerTest.cpp"),
- File("Serializer/UnitTest/AuthRequestSerializerTest.cpp"),
- File("Serializer/UnitTest/AuthResponseSerializerTest.cpp"),
- File("Serializer/UnitTest/XMPPSerializerTest.cpp"),
- File("Serializer/XML/UnitTest/XMLElementTest.cpp"),
- File("StreamManagement/UnitTest/StanzaAckRequesterTest.cpp"),
- File("StreamManagement/UnitTest/StanzaAckResponderTest.cpp"),
- File("StreamStack/UnitTest/StreamStackTest.cpp"),
- File("StreamStack/UnitTest/XMPPLayerTest.cpp"),
- File("StringCodecs/UnitTest/Base64Test.cpp"),
- File("StringCodecs/UnitTest/HexifyTest.cpp"),
- File("StringCodecs/UnitTest/PBKDF2Test.cpp"),
- File("TLS/UnitTest/ServerIdentityVerifierTest.cpp"),
- File("TLS/UnitTest/CertificateTest.cpp"),
- File("VCards/UnitTest/VCardManagerTest.cpp"),
- File("Whiteboard/UnitTest/WhiteboardServerTest.cpp"),
- File("Whiteboard/UnitTest/WhiteboardClientTest.cpp"),
- ])
-
- # Generate the Swiften header
- def relpath(path, start) :
- i = len(os.path.commonprefix([path, start]))
- return path[i+1:]
- swiften_header = "#pragma once\n"
- swiften_includes = []
- swiften_public_includes = []
- top_path = env.Dir("..").abspath
- for root, dirs, files in os.walk(env.Dir(".").abspath) :
- if root.endswith("UnitTest") :
- continue
- for file in files :
- if not file.endswith(".h") :
- continue
- include = relpath(os.path.join(root, file), top_path)
- if swiften_env["PLATFORM"] == "win32" :
- include = include.replace("\\", "/")
- swiften_includes.append(include)
- # Private modules
- if root.endswith("Config") :
- continue
+ env.Append(UNITTEST_SOURCES = [
+ File("Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp"),
+ File("Avatars/UnitTest/VCardAvatarManagerTest.cpp"),
+ File("Avatars/UnitTest/CombinedAvatarProviderTest.cpp"),
+ File("Avatars/UnitTest/AvatarManagerImplTest.cpp"),
+ File("Base/UnitTest/IDGeneratorTest.cpp"),
+ File("Base/UnitTest/SimpleIDGeneratorTest.cpp"),
+ File("Base/UnitTest/StringTest.cpp"),
+ File("Base/UnitTest/DateTimeTest.cpp"),
+ File("Base/UnitTest/ByteArrayTest.cpp"),
+ File("Base/UnitTest/URLTest.cpp"),
+ File("Base/UnitTest/PathTest.cpp"),
+ File("Chat/UnitTest/ChatStateNotifierTest.cpp"),
+# File("Chat/UnitTest/ChatStateTrackerTest.cpp"),
+ File("Client/UnitTest/ClientSessionTest.cpp"),
+ File("Client/UnitTest/NickResolverTest.cpp"),
+ File("Client/UnitTest/ClientBlockListManagerTest.cpp"),
+ File("Client/UnitTest/BlockListImplTest.cpp"),
+ File("Compress/UnitTest/ZLibCompressorTest.cpp"),
+ File("Compress/UnitTest/ZLibDecompressorTest.cpp"),
+ File("Component/UnitTest/ComponentHandshakeGeneratorTest.cpp"),
+ File("Component/UnitTest/ComponentConnectorTest.cpp"),
+ File("Component/UnitTest/ComponentSessionTest.cpp"),
+ File("Disco/UnitTest/CapsInfoGeneratorTest.cpp"),
+ File("Disco/UnitTest/CapsManagerTest.cpp"),
+ File("Disco/UnitTest/EntityCapsManagerTest.cpp"),
+ File("Disco/UnitTest/JIDDiscoInfoResponderTest.cpp"),
+ File("Disco/UnitTest/DiscoInfoResponderTest.cpp"),
+ File("Elements/UnitTest/IQTest.cpp"),
+ File("Elements/UnitTest/StanzaTest.cpp"),
+ File("Elements/UnitTest/FormTest.cpp"),
+ File("EventLoop/UnitTest/EventLoopTest.cpp"),
+ File("EventLoop/UnitTest/SimpleEventLoopTest.cpp"),
+# File("History/UnitTest/SQLiteHistoryManagerTest.cpp"),
+ File("JID/UnitTest/JIDTest.cpp"),
+ File("LinkLocal/UnitTest/LinkLocalConnectorTest.cpp"),
+ File("LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp"),
+ File("LinkLocal/UnitTest/LinkLocalServiceInfoTest.cpp"),
+ File("LinkLocal/UnitTest/LinkLocalServiceTest.cpp"),
+ File("MUC/UnitTest/MUCTest.cpp"),
+ File("MUC/UnitTest/MockMUC.cpp"),
+ File("Network/UnitTest/HostAddressTest.cpp"),
+ File("Network/UnitTest/ConnectorTest.cpp"),
+ File("Network/UnitTest/ChainedConnectorTest.cpp"),
+ File("Network/UnitTest/DomainNameServiceQueryTest.cpp"),
+ File("Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp"),
+ File("Network/UnitTest/BOSHConnectionTest.cpp"),
+ File("Network/UnitTest/BOSHConnectionPoolTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/BlockParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/BodyParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/DiscoInfoParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/DiscoItemsParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/FormParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/CommandParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/PriorityParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/ResourceBindParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/RosterItemExchangeParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/RosterParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/IBBParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/InBandRegistrationPayloadParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/JingleParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/SearchPayloadParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/SecurityLabelParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/SecurityLabelsCatalogParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/SoftwareVersionParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/StatusParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/StatusShowParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/StreamInitiationParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/VCardParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/StorageParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/PrivateStorageParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/VCardUpdateParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/ReplaceTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/MUCAdminPayloadParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/MUCUserPayloadParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/DeliveryReceiptParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/IdleParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/MAMFinParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/MAMResultParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/MAMQueryParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/CarbonsParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/UserTuneParserTest.cpp"),
+ File("Parser/PayloadParsers/UnitTest/UserLocationParserTest.cpp"),
+ File("Parser/UnitTest/BOSHBodyExtractorTest.cpp"),
+ File("Parser/UnitTest/AttributeMapTest.cpp"),
+ File("Parser/UnitTest/EnumParserTest.cpp"),
+ File("Parser/UnitTest/IQParserTest.cpp"),
+ File("Parser/UnitTest/GenericPayloadTreeParserTest.cpp"),
+ File("Parser/UnitTest/MessageParserTest.cpp"),
+ File("Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp"),
+ File("Parser/UnitTest/PresenceParserTest.cpp"),
+ File("Parser/UnitTest/StanzaAckParserTest.cpp"),
+ File("Parser/UnitTest/SerializingParserTest.cpp"),
+ File("Parser/UnitTest/StanzaParserTest.cpp"),
+ File("Parser/UnitTest/StreamFeaturesParserTest.cpp"),
+ File("Parser/UnitTest/StreamManagementEnabledParserTest.cpp"),
+ File("Parser/UnitTest/XMLParserTest.cpp"),
+ File("Parser/UnitTest/XMPPParserTest.cpp"),
+ File("Presence/UnitTest/PresenceOracleTest.cpp"),
+ File("Presence/UnitTest/DirectedPresenceSenderTest.cpp"),
+ File("Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp"),
+ File("Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp"),
+ File("Queries/UnitTest/IQRouterTest.cpp"),
+ File("Queries/UnitTest/RequestTest.cpp"),
+ File("Queries/UnitTest/ResponderTest.cpp"),
+ File("Roster/UnitTest/XMPPRosterImplTest.cpp"),
+ File("Roster/UnitTest/XMPPRosterControllerTest.cpp"),
+ File("Roster/UnitTest/XMPPRosterSignalHandler.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/PayloadsSerializer.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/BlockSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/CarbonsSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/CapsInfoSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/ChatStateSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/FormSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/ErrorSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/IBBSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/PrioritySerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/ResourceBindSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/RosterSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/SearchPayloadSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/SecurityLabelSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/SecurityLabelsCatalogSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/SoftwareVersionSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/StatusSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/StatusShowSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/StreamInitiationSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/InBandRegistrationPayloadSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/IsodeIQDelegationSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/VCardUpdateSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/VCardSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/StorageSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/ReplaceSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/MUCAdminPayloadSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/JingleSerializersTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/DeliveryReceiptSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/IdleSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/ForwardedSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/MAMFinSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/MAMResultSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/PubSubItemSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/UserTuneSerializerTest.cpp"),
+ File("Serializer/PayloadSerializers/UnitTest/UserLocationSerializerTest.cpp"),
+ File("Serializer/UnitTest/StreamFeaturesSerializerTest.cpp"),
+ File("Serializer/UnitTest/AuthSuccessSerializerTest.cpp"),
+ File("Serializer/UnitTest/AuthChallengeSerializerTest.cpp"),
+ File("Serializer/UnitTest/AuthRequestSerializerTest.cpp"),
+ File("Serializer/UnitTest/AuthResponseSerializerTest.cpp"),
+ File("Serializer/UnitTest/XMPPSerializerTest.cpp"),
+ File("Serializer/XML/UnitTest/XMLElementTest.cpp"),
+ File("StreamManagement/UnitTest/StanzaAckRequesterTest.cpp"),
+ File("StreamManagement/UnitTest/StanzaAckResponderTest.cpp"),
+ File("StreamStack/UnitTest/StreamStackTest.cpp"),
+ File("StreamStack/UnitTest/XMPPLayerTest.cpp"),
+ File("StringCodecs/UnitTest/Base64Test.cpp"),
+ File("StringCodecs/UnitTest/HexifyTest.cpp"),
+ File("StringCodecs/UnitTest/PBKDF2Test.cpp"),
+ File("TLS/UnitTest/ServerIdentityVerifierTest.cpp"),
+ File("TLS/UnitTest/CertificateTest.cpp"),
+ File("VCards/UnitTest/VCardManagerTest.cpp"),
+ File("Whiteboard/UnitTest/WhiteboardServerTest.cpp"),
+ File("Whiteboard/UnitTest/WhiteboardClientTest.cpp"),
+ ])
+
+ # Generate the Swiften header
+ def relpath(path, start) :
+ i = len(os.path.commonprefix([path, start]))
+ return path[i+1:]
+ swiften_header = "#pragma once\n"
+ swiften_includes = []
+ swiften_public_includes = []
+ top_path = env.Dir("..").abspath
+ for root, dirs, files in os.walk(env.Dir(".").abspath) :
+ if root.endswith("UnitTest") :
+ continue
+ for file in files :
+ if not file.endswith(".h") :
+ continue
+ include = relpath(os.path.join(root, file), top_path)
+ if swiften_env["PLATFORM"] == "win32" :
+ include = include.replace("\\", "/")
+ swiften_includes.append(include)
+ # Private modules
+ if root.endswith("Config") :
+ continue
- # Library-specfifc private modules
- if root.endswith("OpenSSL") or root.endswith("Cocoa") or root.endswith("Qt") or root.endswith("Avahi") or root.endswith("Bonjour") :
- continue
+ # Library-specfifc private modules
+ if root.endswith("OpenSSL") or root.endswith("Cocoa") or root.endswith("Qt") or root.endswith("Avahi") or root.endswith("Bonjour") :
+ continue
- # Library-specific files
- if file.endswith("_Private.h") or file.startswith("Schannel") or file.startswith("CAPI") or file.startswith("MacOSX") or file.startswith("SecureTransport") or file.startswith("Windows") or file.endswith("_Windows.h") or file.startswith("SQLite") or file == "ICUConverter.h" or file == "UnboundDomainNameResolver.h" :
- continue
+ # Library-specific files
+ if file.endswith("_Private.h") or file.startswith("Schannel") or file.startswith("CAPI") or file.startswith("MacOSX") or file.startswith("SecureTransport") or file.startswith("Windows") or file.endswith("_Windows.h") or file.startswith("SQLite") or file == "ICUConverter.h" or file == "UnboundDomainNameResolver.h" :
+ continue
- # Specific headers we don't want to globally include
- if file == "Swiften.h" or file == "foreach.h" or file == "Log.h" or file == "format.h" :
- continue
- swiften_header += "#include <" + include + ">\n"
- swiften_public_includes.append(include)
- swiften_includes.append(include)
- swiften_env.WriteVal("Swiften.h", swiften_env.Value(swiften_header))
- swiften_includes.append("Swiften/Swiften.h")
+ # Specific headers we don't want to globally include
+ if file == "Swiften.h" or file == "foreach.h" or file == "Log.h" or file == "format.h" :
+ continue
+ swiften_header += "#include <" + include + ">\n"
+ swiften_public_includes.append(include)
+ swiften_includes.append(include)
+ swiften_env.WriteVal("Swiften.h", swiften_env.Value(swiften_header))
+ swiften_includes.append("Swiften/Swiften.h")
- version_header = "#pragma once\n\n"
- version_header += "#define SWIFTEN_VERSION 0x%02X%02X%02X\n" % (swiften_env["SWIFTEN_VERSION_MAJOR"], swiften_env["SWIFTEN_VERSION_MINOR"], swiften_env["SWIFTEN_VERSION_PATCH"])
- version_header += "#define SWIFTEN_VERSION_STRING \"%s\"\n" % swiften_env["SWIFTEN_VERSION"]
- swiften_env.WriteVal("Version.h", swiften_env.Value(version_header))
- swiften_includes.append("Swiften/Version.h")
+ version_header = "#pragma once\n\n"
+ version_header += "#define SWIFTEN_VERSION 0x%02X%02X%02X\n" % (swiften_env["SWIFTEN_VERSION_MAJOR"], swiften_env["SWIFTEN_VERSION_MINOR"], swiften_env["SWIFTEN_VERSION_PATCH"])
+ version_header += "#define SWIFTEN_VERSION_STRING \"%s\"\n" % swiften_env["SWIFTEN_VERSION"]
+ swiften_env.WriteVal("Version.h", swiften_env.Value(version_header))
+ swiften_includes.append("Swiften/Version.h")
- # Check headers
- if env["check_headers"] :
- test_env = swiften_env.Clone()
- for header in swiften_public_includes:
- program_text = "#include <%s>\n" % (header)
- filename = Dir('#/.sconf_temp').abspath + ("/%s.cpp" % (urllib.quote(header, '') ))
- text_file = open(filename, "w")
- text_file.write(program_text)
- text_file.close()
- test_obj = test_env.Object(File("#/.sconf_temp/%s.cpp" % (urllib.quote(header, '') )))
- test_env.Default(test_obj)
+ # Check headers
+ if env["check_headers"] :
+ test_env = swiften_env.Clone()
+ for header in swiften_public_includes:
+ program_text = "#include <%s>\n" % (header)
+ filename = Dir('#/.sconf_temp').abspath + ("/%s.cpp" % (urllib.quote(header, '') ))
+ text_file = open(filename, "w")
+ text_file.write(program_text)
+ text_file.close()
+ test_obj = test_env.Object(File("#/.sconf_temp/%s.cpp" % (urllib.quote(header, '') )))
+ test_env.Default(test_obj)
- # Install swiften
- if swiften_env.get("SWIFTEN_INSTALLDIR", "") :
- swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib"), swiften_lib)
- for alias in myenv["SWIFTEN_LIBRARY_ALIASES"] :
- myenv.Command(myenv.File(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib", alias)), [env.Value(swiften_lib[0].name), swiften_lib[0]], symlink)
- for include in swiften_includes :
- swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "include", os.path.dirname(include)), "#/" + include)
+ # Install swiften
+ if swiften_env.get("SWIFTEN_INSTALLDIR", "") :
+ swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib"), swiften_lib)
+ for alias in myenv["SWIFTEN_LIBRARY_ALIASES"] :
+ myenv.Command(myenv.File(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib", alias)), [env.Value(swiften_lib[0].name), swiften_lib[0]], symlink)
+ for include in swiften_includes :
+ swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "include", os.path.dirname(include)), "#/" + include)
diff --git a/Swiften/StreamManagement/SConscript b/Swiften/StreamManagement/SConscript
index ce95fc7..8eab91b 100644
--- a/Swiften/StreamManagement/SConscript
+++ b/Swiften/StreamManagement/SConscript
@@ -1,8 +1,8 @@
Import("swiften_env")
sources = [
- "StanzaAckRequester.cpp",
- "StanzaAckResponder.cpp",
- ]
+ "StanzaAckRequester.cpp",
+ "StanzaAckResponder.cpp",
+ ]
swiften_env.Append(SWIFTEN_OBJECTS = swiften_env.SwiftenObject(sources))
diff --git a/Swiften/StreamStack/SConscript b/Swiften/StreamStack/SConscript
index 06fcc03..0a8bab1 100644
--- a/Swiften/StreamStack/SConscript
+++ b/Swiften/StreamStack/SConscript
@@ -3,14 +3,14 @@ Import("swiften_env")
myenv = swiften_env.Clone()
sources = [
- "HighLayer.cpp",
- "LowLayer.cpp",
- "StreamStack.cpp",
- "ConnectionLayer.cpp",
- "TLSLayer.cpp",
- "WhitespacePingLayer.cpp",
- "XMPPLayer.cpp",
- ]
+ "HighLayer.cpp",
+ "LowLayer.cpp",
+ "StreamStack.cpp",
+ "ConnectionLayer.cpp",
+ "TLSLayer.cpp",
+ "WhitespacePingLayer.cpp",
+ "XMPPLayer.cpp",
+ ]
objects = myenv.SwiftenObject(sources)
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/TLS/SConscript b/Swiften/TLS/SConscript
index c1ff425..68bf50b 100644
--- a/Swiften/TLS/SConscript
+++ b/Swiften/TLS/SConscript
@@ -1,40 +1,40 @@
Import("swiften_env")
objects = swiften_env.SwiftenObject([
- "Certificate.cpp",
- "CertificateFactory.cpp",
- "CertificateTrustChecker.cpp",
- "ServerIdentityVerifier.cpp",
- "TLSContext.cpp",
- "TLSContextFactory.cpp",
- ])
-
+ "Certificate.cpp",
+ "CertificateFactory.cpp",
+ "CertificateTrustChecker.cpp",
+ "ServerIdentityVerifier.cpp",
+ "TLSContext.cpp",
+ "TLSContextFactory.cpp",
+ ])
+
myenv = swiften_env.Clone()
if myenv.get("HAVE_OPENSSL", 0) :
- myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
- objects += myenv.SwiftenObject([
- "OpenSSL/OpenSSLContext.cpp",
- "OpenSSL/OpenSSLCertificate.cpp",
- "OpenSSL/OpenSSLContextFactory.cpp",
- ])
- myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
+ myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
+ objects += myenv.SwiftenObject([
+ "OpenSSL/OpenSSLContext.cpp",
+ "OpenSSL/OpenSSLCertificate.cpp",
+ "OpenSSL/OpenSSLContextFactory.cpp",
+ ])
+ myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
elif myenv.get("HAVE_SCHANNEL", 0) :
- swiften_env.Append(LIBS = ["Winscard"])
- objects += myenv.SwiftenObject([
- "CAPICertificate.cpp",
- "Schannel/SchannelContext.cpp",
- "Schannel/SchannelCertificate.cpp",
- "Schannel/SchannelContextFactory.cpp",
- ])
- myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
+ swiften_env.Append(LIBS = ["Winscard"])
+ objects += myenv.SwiftenObject([
+ "CAPICertificate.cpp",
+ "Schannel/SchannelContext.cpp",
+ "Schannel/SchannelCertificate.cpp",
+ "Schannel/SchannelContextFactory.cpp",
+ ])
+ myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
elif myenv.get("HAVE_SECURETRANSPORT", 0) :
- #swiften_env.Append(LIBS = ["Winscard"])
- objects += myenv.SwiftenObject([
- "SecureTransport/SecureTransportContext.mm",
- "SecureTransport/SecureTransportCertificate.mm",
- "SecureTransport/SecureTransportContextFactory.cpp",
- ])
- myenv.Append(CPPDEFINES = "HAVE_SECURETRANSPORT")
+ #swiften_env.Append(LIBS = ["Winscard"])
+ objects += myenv.SwiftenObject([
+ "SecureTransport/SecureTransportContext.mm",
+ "SecureTransport/SecureTransportCertificate.mm",
+ "SecureTransport/SecureTransportContextFactory.cpp",
+ ])
+ myenv.Append(CPPDEFINES = "HAVE_SECURETRANSPORT")
objects += myenv.SwiftenObject(["PlatformTLSFactories.cpp"])
diff --git a/Swiften/VCards/SConscript b/Swiften/VCards/SConscript
index c20c17d..d8189cb 100644
--- a/Swiften/VCards/SConscript
+++ b/Swiften/VCards/SConscript
@@ -1,7 +1,7 @@
Import("swiften_env")
objects = swiften_env.SwiftenObject([
- "VCardManager.cpp",
- "VCardStorage.cpp",
- ])
+ "VCardManager.cpp",
+ "VCardStorage.cpp",
+ ])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])