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
@@ -142,6 +142,7 @@ if env["SCONS_STAGE"] == "build" :
             "Elements/PubSubPayload.cpp",
             "Elements/PubSubOwnerPayload.cpp",
             "Elements/PubSubEventPayload.cpp",
+            "Elements/ReferencePayload.cpp",
             "Elements/RosterItemExchangePayload.cpp",
             "Elements/RosterPayload.cpp",
             "Elements/SecurityLabel.cpp",
@@ -164,6 +165,8 @@ if env["SCONS_STAGE"] == "build" :
             "Elements/IsodeIQDelegation.cpp",
             "Entity/Entity.cpp",
             "Entity/PayloadPersister.cpp",
+            "MIX/MIX.cpp",
+            "MIX/MIXImpl.cpp",
             "MUC/MUC.cpp",
             "MUC/MUCImpl.cpp",
             "MUC/MUCManager.cpp",
@@ -208,17 +211,22 @@ if env["SCONS_STAGE"] == "build" :
             "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",
@@ -411,6 +419,7 @@ if env["SCONS_STAGE"] == "build" :
             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"),
@@ -430,6 +439,7 @@ if env["SCONS_STAGE"] == "build" :
             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"),
@@ -437,7 +447,12 @@ if env["SCONS_STAGE"] == "build" :
             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"),
@@ -502,6 +517,7 @@ if env["SCONS_STAGE"] == "build" :
             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"),
@@ -521,9 +537,14 @@ if env["SCONS_STAGE"] == "build" :
             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"),
@@ -558,6 +579,10 @@ if env["SCONS_STAGE"] == "build" :
             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) :
@@ -568,6 +593,8 @@ if env["SCONS_STAGE"] == "build" :
     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 :