1 files changed, 28 insertions, 1 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index f52637b..4deddaf 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -136,18 +136,19 @@ if env["SCONS_STAGE"] == "build" :
             "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/ReferencePayload.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",
@@ -158,18 +159,20 @@ if env["SCONS_STAGE"] == "build" :
             "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",
+            "MIX/MIX.cpp",
+            "MIX/MIXImpl.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",
@@ -202,29 +205,34 @@ if env["SCONS_STAGE"] == "build" :
             "Serializer/PayloadSerializers/CarbonsSentSerializer.cpp",
             "Serializer/PayloadSerializers/CarbonsReceivedSerializer.cpp",
             "Serializer/PayloadSerializers/ChatStateSerializer.cpp",
             "Serializer/PayloadSerializers/ClientStateSerializer.cpp",
             "Serializer/PayloadSerializers/DiscoInfoSerializer.cpp",
             "Serializer/PayloadSerializers/DiscoItemsSerializer.cpp",
             "Serializer/PayloadSerializers/ErrorSerializer.cpp",
             "Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp",
             "Serializer/PayloadSerializers/MIXParticipantSerializer.cpp",
+            "Serializer/PayloadSerializers/MIXSetNickSerializer.cpp",
+            "Serializer/PayloadSerializers/MIXRegisterNickSerializer.cpp",
             "Serializer/PayloadSerializers/MIXDestroySerializer.cpp",
             "Serializer/PayloadSerializers/MIXCreateSerializer.cpp",
+            "Serializer/PayloadSerializers/MIXPayloadSerializer.cpp",
             "Serializer/PayloadSerializers/MIXUserPreferenceSerializer.cpp",
+            "Serializer/PayloadSerializers/MIXLeaveSerializer.cpp",
             "Serializer/PayloadSerializers/MIXJoinSerializer.cpp",
-            "Serializer/PayloadSerializers/MIXSubscribeSerializer.cpp",
+            "Serializer/PayloadSerializers/MIXUpdateSubscriptionSerializer.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/ReferencePayloadSerializer.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",
@@ -405,18 +413,19 @@ if env["SCONS_STAGE"] == "build" :
             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("MIX/UnitTest/MIXImplTest.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"),
@@ -424,26 +433,32 @@ if env["SCONS_STAGE"] == "build" :
             File("Parser/PayloadParsers/UnitTest/BodyParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/ClientStateParserTest.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/ReferencePayloadParserTest.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/MIXParticipantParserTest.cpp"),
+            File("Parser/PayloadParsers/UnitTest/MIXPayloadParserTest.cpp"),
+            File("Parser/PayloadParsers/UnitTest/MIXUpdateSubscriptionParserTest.cpp"),
+            File("Parser/PayloadParsers/UnitTest/MIXRegisterNickParserTest.cpp"),
+            File("Parser/PayloadParsers/UnitTest/MIXSetNickParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/MIXDestroyParserTest.cpp"),
+            File("Parser/PayloadParsers/UnitTest/MIXLeaveParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/MIXCreateParserTest.cpp"),
             File("Parser/PayloadParsers/UnitTest/MIXUserPreferenceParserTest.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"),
@@ -496,18 +511,19 @@ if env["SCONS_STAGE"] == "build" :
             File("Serializer/PayloadSerializers/UnitTest/CarbonsSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/CapsInfoSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/ChatStateSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/ClientStateSerializerTest.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/ReferencePayloadSerializerTest.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"),
@@ -515,21 +531,26 @@ if env["SCONS_STAGE"] == "build" :
             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/MIXParticipantSerializerTest.cpp"),
+            File("Serializer/PayloadSerializers/UnitTest/MIXSetNickSerializerTest.cpp"),
+            File("Serializer/PayloadSerializers/UnitTest/MIXUpdateSubscriptionSerializerTest.cpp"),
+            File("Serializer/PayloadSerializers/UnitTest/MIXRegisterNickSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/MIXDestroySerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/MIXCreateSerializerTest.cpp"),
+            File("Serializer/PayloadSerializers/UnitTest/MIXPayloadSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/MIXUserPreferenceSerializerTest.cpp"),
+            File("Serializer/PayloadSerializers/UnitTest/MIXLeaveSerializerTest.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/MIXJoinSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/MAMFinSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/MAMResultSerializerTest.cpp"),
             File("Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp"),
@@ -552,28 +573,34 @@ if env["SCONS_STAGE"] == "build" :
             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"),
         ])
+    if env.get("HAVE_OPENSSL", 0) :
+        env.Append(UNITTEST_SOURCES = [
+            File("TLS/UnitTest/ClientServerTest.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) :
+        dirs.sort()
+        files.sort()
         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)