1 files changed, 142 insertions, 104 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index ff97b42..96979c0 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -1,5 +1,6 @@
 import os, datetime, re, time
 import Version
+import SCons.Util
 
 def generateQRCTheme(dir, prefix) :
     sourceDir = dir.abspath
@@ -7,6 +8,11 @@ def generateQRCTheme(dir, prefix) :
     result += "<RCC version =\"1.0\">"
     result += "<qresource prefix=\"/themes/" + prefix + "\">"
     for (path, dirs, files) in os.walk(sourceDir) :
+        #skip the Noto emoji fonts in Windows. No need to package them since they aren't used
+        if "Noto" in path and not env["PLATFORM"] == "linux" :
+            continue
+        dirs.sort()
+        files.sort()
         for file in files :
             filePath = os.path.join(path,file)
             result += "<file alias=\"%(alias)s\">%(path)s</file>" % {
@@ -19,12 +25,12 @@ def generateQRCTheme(dir, prefix) :
 
 Import("env")
 
-myenv = env.Clone()
+myenv = env.Clone(tools = [ 'textfile' ])
 
 # Disable warnings that affect Qt
-myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"])
+myenv["CXXFLAGS"] = list(filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"]))
 if "clang" in env["CC"] :
-    myenv.Append(CXXFLAGS = ["-Wno-float-equal", "-Wno-shorten-64-to-32", "-Wno-missing-prototypes", "-Wno-unreachable-code", "-Wno-disabled-macro-expansion", "-Wno-unused-private-field", "-Wno-extra-semi", "-Wno-duplicate-enum", "-Wno-missing-variable-declarations", "-Wno-conversion", "-Wno-undefined-reinterpret-cast"])
+    myenv.Append(CXXFLAGS = ["-Wno-float-equal", "-Wno-shorten-64-to-32", "-Wno-conversion"])
 
 myenv.UseFlags(env["SWIFT_CONTROLLERS_FLAGS"])
 myenv.UseFlags(env["SWIFTOOLS_FLAGS"])
@@ -57,7 +63,7 @@ myenv.Tool("textfile", toolpath = ["#/BuildTools/SCons/Tools"])
 qt4modules = ['QtCore', 'QtWebKit', 'QtGui']
 if myenv["qt5"] :
     qt_version = '5'
-    # QtSvg is required so the image format plugin for SVG images is installed 
+    # QtSvg is required so the image format plugin for SVG images is installed
     # correctly by Qt's deployment tools.
     qt4modules += ['QtWidgets', 'QtWebKitWidgets', 'QtMultimedia', 'QtSvg']
     if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
@@ -110,131 +116,140 @@ myenv.WriteVal("DefaultTheme.qrc", myenv.Value(generateQRCTheme(myenv.Dir("#/Swi
 
 sources = [
     "main.cpp",
+    "ChatList/ChatListDelegate.cpp",
+    "ChatList/ChatListModel.cpp",
+    "ChatList/ChatListMUCItem.cpp",
+    "ChatList/ChatListRecentItem.cpp",
+    "ChatList/ChatListWhiteboardItem.cpp",
+    "ChatList/QtChatListWindow.cpp",
+    "ChattablesModel.cpp",
+    "ChatSnippet.cpp",
+    "EventViewer/EventDelegate.cpp",
+    "EventViewer/EventModel.cpp",
+    "EventViewer/QtEvent.cpp",
+    "EventViewer/QtEventWindow.cpp",
+    "EventViewer/TwoLineDelegate.cpp",
     "FlowLayout.cpp",
+    "MessageSnippet.cpp",
+    "MUCSearch/MUCSearchDelegate.cpp",
+    "MUCSearch/MUCSearchEmptyItem.cpp",
+    "MUCSearch/MUCSearchModel.cpp",
+    "MUCSearch/MUCSearchRoomItem.cpp",
+    "MUCSearch/MUCSearchServiceItem.cpp",
+    "MUCSearch/QtLeafSortFilterProxyModel.cpp",
+    "MUCSearch/QtMUCSearchWindow.cpp",
+    "ServerList/ServerListDelegate.cpp",
+    "ServerList/ServerListModel.cpp",
+    "ServerList/QtServerListView.cpp",
+    "qrc_DefaultTheme.cc",
+    "qrc_Swift.cc",
     "QtAboutWidget.cpp",
-    "QtSpellCheckerWindow.cpp",
+    "QtAddBookmarkWindow.cpp",
+    "QtAdHocCommandWindow.cpp",
+    "QtAdHocCommandWithJIDWindow.cpp",
+    "QtAffiliationEditor.cpp",
     "QtAvatarWidget.cpp",
-    "QtUIFactory.cpp",
+    "QtBlockListEditorWindow.cpp",
+    "QtBookmarkDetailWindow.cpp",
+    "QtCachedImageScaler.cpp",
+    "QtChatOverview.cpp",
+    "QtChatOverviewBundle.cpp",
+    "QtChatOverviewDelegate.cpp",
+    "QtChatTabs.cpp",
+    "QtChatTabsBase.cpp",
+    "QtChatTheme.cpp",
+    "QtChatView.cpp",
+    "QtChatWindow.cpp",
     "QtChatWindowFactory.cpp",
+    "QtChatWindowJSBridge.cpp",
+    "QtCheckBoxStyledItemDelegate.cpp",
     "QtClickableLabel.cpp",
+    "QtClosableLineEdit.cpp",
+    "QtColorSelectionStyledItemDelegate.cpp",
+    "QtColorToolButton.cpp",
+    "QtConnectionSettingsWindow.cpp",
+    "QtContactEditWidget.cpp",
+    "QtContactEditWindow.cpp",
+    "QtEditBookmarkWindow.cpp",
+    "QtElidingLabel.cpp",
+    "QtEmojiCell.cpp",
+    "QtEmojisGrid.cpp",
+    "QtEmojisScroll.cpp",
+    "QtEmojisSelector.cpp",
+    "QtEmoticonsGrid.cpp",
+    "QtExpandedListView.cpp",
+    "QtFdpFormSubmitWindow.cpp",
+    "QtFileTransferListItemModel.cpp",
+    "QtFileTransferListWidget.cpp",
+    "QtFormResultItemModel.cpp",
+    "QtFormWidget.cpp",
+    "QtHighlightNotificationConfigDialog.cpp",
+    "QtHistoryWindow.cpp",
+    "QtJoinMUCWindow.cpp",
+    "QtLineEdit.cpp",
+    "QtListWidget.cpp",
     "QtLoginWindow.cpp",
     "QtMainWindow.cpp",
-    "QtProfileWindow.cpp",
-    "QtBlockListEditorWindow.cpp",
+    "QtMUCConfigurationWindow.cpp",
     "QtNameWidget.cpp",
+    "QtPlainChatView.cpp",
+    "QtProfileWindow.cpp",
+    "QtRecentEmojisGrid.cpp",
+    "QtResourceHelper.cpp",
+    "QtRosterHeader.cpp",
+    "QtScaledAvatarCache.cpp",
     "QtSettingsProvider.cpp",
+    "QtSingleWindow.cpp",
+    "QtSoundPlayer.cpp",
+    "QtSoundSelectionStyledItemDelegate.cpp",
+    "QtSpellCheckerWindow.cpp",
+    "QtSpellCheckHighlighter.cpp",
     "QtStatusWidget.cpp",
-    "QtScaledAvatarCache.cpp",
+    "QtSubscriptionRequestWindow.cpp",
     "QtSwift.cpp",
-    "QtURIHandler.cpp",
-    "QtChatWindow.cpp",
-    "QtChatView.cpp",
-    "QtWebKitChatView.cpp",
-    "QtPlainChatView.cpp",
-    "QtChatTheme.cpp",
-    "QtChatTabs.cpp",
-    "QtChatTabsBase.cpp",
-    "QtChatTabsShortcutOnlySubstitute.cpp",
-    "QtSoundPlayer.cpp",
     "QtSystemTray.cpp",
-    "QtCachedImageScaler.cpp",
     "QtTabbable.cpp",
     "QtTabWidget.cpp",
     "QtTextEdit.cpp",
-    "QtXMLConsoleWidget.cpp",
-    "QtHistoryWindow.cpp",
-    "QtFileTransferListWidget.cpp",
-    "QtFileTransferListItemModel.cpp",
-    "QtAdHocCommandWindow.cpp",
-    "QtAdHocCommandWithJIDWindow.cpp",
+    "QtUIFactory.cpp",
+    "QtUISettingConstants.cpp",
+    "QtUpdateFeedSelectionDialog.cpp",
+    "QtURIHandler.cpp",
+    "QtURLValidator.cpp",
     "QtUtilities.cpp",
-    "QtBookmarkDetailWindow.cpp",
-    "QtAddBookmarkWindow.cpp",
-    "QtEditBookmarkWindow.cpp",
-    "QtEmojisGrid.cpp",
-    "QtEmojiCell.cpp",
-    "QtEmojisScroll.cpp",
-    "QtEmojisSelector.cpp",
-    "QtRecentEmojisGrid.cpp",
-    "QtEmoticonsGrid.cpp",
-    "QtContactEditWindow.cpp",
-    "QtContactEditWidget.cpp",
-    "QtSingleWindow.cpp",
-    "QtColorToolButton.cpp",
-    "QtClosableLineEdit.cpp",
-    "QtHighlightNotificationConfigDialog.cpp",
-    "ChatSnippet.cpp",
-    "MessageSnippet.cpp",
-    "SystemMessageSnippet.cpp",
-    "QtElidingLabel.cpp",
-    "QtFormWidget.cpp",
-    "QtFormResultItemModel.cpp",
-    "QtLineEdit.cpp",
-    "QtJoinMUCWindow.cpp",
-    "QtConnectionSettingsWindow.cpp",
-    "Roster/RosterModel.cpp",
-    "Roster/QtTreeWidget.cpp",
-    "Roster/RosterDelegate.cpp",
-    "Roster/GroupItemDelegate.cpp",
+    "QtWebKitChatView.cpp",
+    "QtWebView.cpp",
+    "QtXMLConsoleWidget.cpp",
     "Roster/DelegateCommons.cpp",
+    "Roster/GroupItemDelegate.cpp",
     "Roster/QtFilterWidget.cpp",
-    "Roster/QtRosterWidget.cpp",
     "Roster/QtOccupantListWidget.cpp",
+    "Roster/QtRosterWidget.cpp",
+    "Roster/QtTreeWidget.cpp",
+    "Roster/RosterDelegate.cpp",
+    "Roster/RosterModel.cpp",
     "Roster/RosterTooltip.cpp",
-    "EventViewer/EventModel.cpp",
-    "EventViewer/EventDelegate.cpp",
-    "EventViewer/TwoLineDelegate.cpp",
-    "EventViewer/QtEventWindow.cpp",
-    "EventViewer/QtEvent.cpp",
-    "ChatList/QtChatListWindow.cpp",
-    "ChatList/ChatListModel.cpp",
-    "ChatList/ChatListDelegate.cpp",
-    "ChatList/ChatListMUCItem.cpp",
-    "ChatList/ChatListRecentItem.cpp",
-    "ChatList/ChatListWhiteboardItem.cpp",
-    "MUCSearch/MUCSearchDelegate.cpp",
-    "MUCSearch/MUCSearchEmptyItem.cpp",
-    "MUCSearch/MUCSearchModel.cpp",
-    "MUCSearch/MUCSearchRoomItem.cpp",
-    "MUCSearch/MUCSearchServiceItem.cpp",
-    "MUCSearch/QtLeafSortFilterProxyModel.cpp",
-    "MUCSearch/QtMUCSearchWindow.cpp",
+    "SystemMessageSnippet.cpp",
+    "Trellis/QtDNDTabBar.cpp",
+    "Trellis/QtDynamicGridLayout.cpp",
+    "Trellis/QtGridSelectionDialog.cpp",
     "UserSearch/ContactListDelegate.cpp",
     "UserSearch/ContactListModel.cpp",
     "UserSearch/QtContactListWidget.cpp",
     "UserSearch/QtSuggestingJIDInput.cpp",
-    "UserSearch/QtUserSearchFirstPage.cpp",
-    "UserSearch/QtUserSearchFirstMultiJIDPage.cpp",
+    "UserSearch/QtUserSearchDetailsPage.cpp",
     "UserSearch/QtUserSearchFieldsPage.cpp",
+    "UserSearch/QtUserSearchFirstMultiJIDPage.cpp",
+    "UserSearch/QtUserSearchFirstPage.cpp",
     "UserSearch/QtUserSearchResultsPage.cpp",
-    "UserSearch/QtUserSearchDetailsPage.cpp",
     "UserSearch/QtUserSearchWindow.cpp",
-    "UserSearch/UserSearchModel.cpp",
     "UserSearch/UserSearchDelegate.cpp",
+    "UserSearch/UserSearchModel.cpp",
+    "Whiteboard/ColorWidget.cpp",
     "Whiteboard/FreehandLineItem.cpp",
     "Whiteboard/GView.cpp",
-    "Whiteboard/TextDialog.cpp",
     "Whiteboard/QtWhiteboardWindow.cpp",
-    "Whiteboard/ColorWidget.cpp",
-    "QtSubscriptionRequestWindow.cpp",
-    "QtRosterHeader.cpp",
-    "QtWebView.cpp",
-    "qrc_DefaultTheme.cc",
-    "qrc_Swift.cc",
-    "QtChatWindowJSBridge.cpp",
-    "QtMUCConfigurationWindow.cpp",
-    "QtAffiliationEditor.cpp",
-    "QtUISettingConstants.cpp",
-    "QtURLValidator.cpp",
-    "QtResourceHelper.cpp",
-    "QtSpellCheckHighlighter.cpp",
-    "QtUpdateFeedSelectionDialog.cpp",
-    "Trellis/QtDynamicGridLayout.cpp",
-    "Trellis/QtDNDTabBar.cpp",
-    "Trellis/QtGridSelectionDialog.cpp",
-    "QtCheckBoxStyledItemDelegate.cpp",
-    "QtColorSelectionStyledItemDelegate.cpp",
-    "QtSoundSelectionStyledItemDelegate.cpp"
+    "Whiteboard/TextDialog.cpp"
 ]
 
 if env["PLATFORM"] == "win32" :
@@ -351,7 +366,7 @@ myenv["TEXTFILESUFFIX"] = ""
 copying_files = [myenv.File("../../COPYING.gpl"), myenv.File("../../COPYING.thirdparty"), myenv.File("../../COPYING.dependencies")]
 if env["PLATFORM"] == "darwin" and env["HAVE_SPARKLE"] :
     copying_files.append(env["SPARKLE_COPYING"])
-myenv.MyTextfile(target = "COPYING", source = copying_files, LINESEPARATOR = "\n\n========\n\n\n")
+myenv.Textfile(target = "COPYING", source = copying_files, LINESEPARATOR = "\n\n========\n\n\n")
 
 ################################################################################
 # Translation
@@ -461,11 +476,16 @@ if env["PLATFORM"] == "win32" :
         #myenv.Nsis("../Packaging/nsis/swift.nsi")
         if env["SCONS_STAGE"] == "build" and env.get("wix_bindir", None):
             def convertToRTF(env, target, source) :
-                infile = open(source[0].abspath, 'r')
-                outfile = open(target[0].abspath, 'w')
+                if SCons.Util.PY3:
+                    infile = open(source[0].abspath, 'r', encoding="utf8")
+                    outfile = open(target[0].abspath, 'w', encoding="utf8")
+                else:
+                    infile = open(source[0].abspath, 'r')
+                    outfile = open(target[0].abspath, 'w')
                 outfile.write('{\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\fs16\\f0\\pard\n')
                 for line in infile:
-                    for char in line.decode("utf-8") :
+                    line = line if SCons.Util.PY3 else line.decode("utf-8")
+                    for char in line :
                         if ord(char) > 127 :
                             # FIXME: This is incorrect, because it only works for latin1.
                             # The correct way is \u<decimal utf16 point>? , but this is more
@@ -478,9 +498,16 @@ if env["PLATFORM"] == "win32" :
                 outfile.close()
                 infile.close()
             copying = env.Command(["Swift/COPYING.rtf"], ["COPYING"], convertToRTF)
+            if env.get("vcredistdir", "") :
+                vcredistdir = os.path.dirname(env["vcredistdir"])
+            else:
+                vcredistdir = os.path.dirname(env["vcredist"])+"\\..\\" + ("x86" if env["win_target_arch"] == "x86" else "x64") + "\\Microsoft.VC"+env.get("MSVC_VERSION", "").replace(".","")[:3]+".CRT\\"
             wixvariables = {
                 'VCCRTFile': env["vcredist"],
-                'Version': str(myenv["SWIFT_VERSION_MAJOR"]) + "." + str(myenv["SWIFT_VERSION_MINOR"]) + "." + str(myenv["SWIFT_VERSION_PATCH"])
+                'VCCRTPath': vcredistdir,
+                'Version': str(myenv["SWIFT_VERSION_MAJOR"]) + "." + str(myenv["SWIFT_VERSION_MINOR"]) + "." + str(myenv["SWIFT_VERSION_PATCH"]),
+                'MsvcVersion': str(env.get("MSVC_VERSION", "").replace(".","")[:3]),
+                'MsvcDotVersion': str(env.get("MSVC_VERSION", "")[:4])
             }
             wixincludecontent = "<Include>"
             for key in wixvariables:
@@ -494,7 +521,18 @@ if env["PLATFORM"] == "win32" :
             lightTask = myenv.WiX_Light('#/Packages/Swift/Swift-' + myenv["SWIFT_VERSION"] + '.msi', ['..\\Packaging\\WiX\\gen_files.wixobj','..\\Packaging\\WiX\\Swift.wixobj'])
             if myenv.get("SIGNTOOL_KEY_PFX", None) and myenv.get("SIGNTOOL_TIMESTAMP_URL", None) :
                 def signToolAction(target = None, source = None, env = None):
-                    env.Execute('signtool.exe sign /fd SHA256 /f "${SIGNTOOL_KEY_PFX}" /t "${SIGNTOOL_TIMESTAMP_URL}" ' + str(target[0]))
+                    signresult = 0
+                    for x in range (1, 4) :
+                        print("Attemping to sign the packages [%s]" % x)
+                        signresult = env.Execute('signtool.exe sign /fd SHA256 /f "${SIGNTOOL_KEY_PFX}" /t "${SIGNTOOL_TIMESTAMP_URL}" /d "Swift Installer" ' + str(target[0]))
+                        if signresult != 1 :
+                            break
+                    #If all 3 attemps to sign the package failed, stop the build.
+                    if signresult == 1 :
+                        print("Error: The build has failed to sign the installer package")
+                        Exit(1)
+                    if signresult == 2 :
+                        print("Signing was completed with warnings.")
 
                 myenv.AddPostAction(lightTask, signToolAction)