6 files changed, 67 insertions, 27 deletions
diff --git a/BuildTools/SCons/Tools/AppBundle.py b/BuildTools/SCons/Tools/AppBundle.py
index 337e83f..31cfef1 100644
--- a/BuildTools/SCons/Tools/AppBundle.py
+++ b/BuildTools/SCons/Tools/AppBundle.py
@@ -34,7 +34,7 @@ def generate(env) :
     """
         for key, value in infoDict.items() :
             plist += "<key>" + key + "</key>\n"
-            plist += "<string>" + value.encode("utf-8") + "</string>\n"
+            plist += "<string>" + value + "</string>\n"
         if handlesXMPPURIs :
             plist += """<key>CFBundleURLTypes</key>
 <array>
@@ -50,7 +50,7 @@ def generate(env) :
 
         if sparklePublicDSAKey :
             plist += "<key>SUPublicDSAKeyFile</key>"
-            plist += "<string>" + sparklePublicDSAKey.name.encode("utf-8") + "</string>"
+            plist += "<string>" + sparklePublicDSAKey.name + "</string>"
             env.Install(resourcesDir, sparklePublicDSAKey)
         plist += """</dict>
     </plist>
diff --git a/BuildTools/SCons/Tools/InstallWithSymLinks.py b/BuildTools/SCons/Tools/InstallWithSymLinks.py
index 23d12ed..4955192 100644
--- a/BuildTools/SCons/Tools/InstallWithSymLinks.py
+++ b/BuildTools/SCons/Tools/InstallWithSymLinks.py
@@ -74,21 +74,21 @@ def scons_copytree(src, dst, symlinks=False):
             else:
                 shutil.copy2(srcname, dstname)
             # XXX What about devices, sockets etc.?
-        except (IOError, os.error), why:
+        except (IOError, os.error) as why:
             errors.append((srcname, dstname, str(why)))
         # catch the CopytreeError from the recursive copytree so that we can
         # continue with other files
-        except CopytreeError, err:
+        except CopytreeError as err:
             errors.extend(err.args[0])
     try:
         shutil.copystat(src, dst)
     except WindowsError:
         # can't copy file access times on Windows
         pass
-    except OSError, why:
+    except OSError as why:
         errors.extend((src, dst, str(why)))
     if errors:
-        raise CopytreeError, errors
+        raise CopytreeError(errors)
 
 
 def symlinkBuilderImpl(target, source, env):
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index 20d41ff..4d73fa3 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -33,7 +33,7 @@ def generate(env) :
 
             mappings = []
 
-            p = re.compile(ur'"([^\"]*)" "([^\"]*)"')
+            p = re.compile(r'"([^\"]*)" "([^\"]*)"')
 
             matches = re.findall(p, stdout)
             for match in matches:
@@ -83,8 +83,21 @@ def generate(env) :
         qtmappings = captureWinDeployQtMapping()
         assert(qtmappings)
 
+        # Add QtWebKit dependencies.
+        # This is needed as QtWebKit since 5.6 is developed and released seperately
+        # of Qt and windeployqt does not know about its dependencies anymore.
+        for map_from, map_to in qtmappings:
+            if map_to == "Qt5WebKit.dll":
+                # hidden Qt5WebKit dependencies
+                hidden_dependencies = ["libxml2.dll", "libxslt.dll"]
+                for dependency in hidden_dependencies:
+                    dependency_from_path = os.path.join(env["QTDIR"], "bin", dependency)
+                    if os.path.isfile(dependency_from_path):
+                        qtmappings.append((dependency_from_path, dependency))
+                break
+
         # handle core DLLs
-        qt_corelib_regex = re.compile(ur".*bin.*\\(.*)\.dll")
+        qt_corelib_regex = re.compile(r".*bin.*\\(.*)\.dll")
 
         for qtlib in qtlibs:
             if qtlib.startswith("Qt5"):
@@ -98,7 +111,7 @@ def generate(env) :
                 all_files += env.Install(bundle, src_path)
 
         # handle plugins
-        qt_plugin_regex = re.compile(ur".*plugins.*\\(.*)\\(.*)\.dll")
+        qt_plugin_regex = re.compile(r".*plugins.*\\(.*)\\(.*)\.dll")
         for (src_path, target_path) in qtmappings:
             if qt_plugin_regex.match(src_path):
                 plugin_folder, filename = qt_plugin_regex.match(src_path).groups()
@@ -119,4 +132,3 @@ def generate(env) :
 
 def exists(env) :
     return env["PLATFORM"] == "win32"
-
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index d5c14e2..372b261 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -37,6 +37,7 @@ __revision__ = "/home/scons/scons/branch.0/branch.96/baseline/src/engine/SCons/T
 import os.path
 import re
 import subprocess
+from string import Template
 
 import SCons.Action
 import SCons.Builder
@@ -129,7 +130,9 @@ class _Automoc:
         
         # The following is kind of hacky to get builders working properly (FIXME)
         objBuilderEnv = objBuilder.env
-        objBuilder.env = env
+        objBuilder.env = env.Clone()
+        if os.path.basename(objBuilder.env ["CXX"]).startswith(("gcc", "clang")):
+            objBuilder.env.Append(CXXFLAGS = "-w")
         mocBuilderEnv = env.Moc4.env
         env.Moc4.env = env
         
@@ -137,23 +140,23 @@ class _Automoc:
         out_sources = source[:]
 
         for obj in source:
-            if isinstance(obj,basestring):  # big kludge!
-                print "scons: qt4: '%s' MAYBE USING AN OLD SCONS VERSION AND NOT CONVERTED TO 'File'. Discarded." % str(obj)
+            if isinstance(obj,str):  # big kludge!
+                print("scons: qt4: '%s' MAYBE USING AN OLD SCONS VERSION AND NOT CONVERTED TO 'File'. Discarded." % str(obj))
                 continue
             if not obj.has_builder():
                 # binary obj file provided
                 if debug:
-                    print "scons: qt: '%s' seems to be a binary. Discarded." % str(obj)
+                    print("scons: qt: '%s' seems to be a binary. Discarded." % str(obj))
                 continue
             cpp = obj.sources[0]
             if not splitext(str(cpp))[1] in cxx_suffixes:
                 if debug:
-                    print "scons: qt: '%s' is no cxx file. Discarded." % str(cpp) 
+                    print("scons: qt: '%s' is no cxx file. Discarded." % str(cpp) )
                 # c or fortran source
                 continue
             #cpp_contents = comment.sub('', cpp.get_contents())
             try:
-                cpp_contents = cpp.get_contents()
+                cpp_contents = str(cpp.get_contents())
             except: continue # may be an still not generated source
             h=None
             for h_ext in header_extensions:
@@ -163,12 +166,12 @@ class _Automoc:
                 h = find_file(hname, (cpp.get_dir(),), env.File)
                 if h:
                     if debug:
-                        print "scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp))
+                        print("scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp)))
                     #h_contents = comment.sub('', h.get_contents())
-                    h_contents = h.get_contents()
+                    h_contents = str(h.get_contents())
                     break
             if not h and debug:
-                print "scons: qt: no header for '%s'." % (str(cpp))
+                print("scons: qt: no header for '%s'." % (str(cpp)))
             if h and q_object_search.search(h_contents):
                 # h file with the Q_OBJECT macro found -> add moc_cpp
                 moc_cpp = env.Moc4(h)
@@ -176,14 +179,14 @@ class _Automoc:
                 out_sources.append(moc_o)
                 #moc_cpp.target_scanner = SCons.Defaults.CScan
                 if debug:
-                    print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp))
+                    print("scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp)))
             if cpp and q_object_search.search(cpp_contents):
                 # cpp file with Q_OBJECT macro found -> add moc
                 # (to be included in cpp)
                 moc = env.Moc4(cpp)
                 env.Ignore(moc, moc)
                 if debug:
-                    print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(cpp), str(moc))
+                    print("scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(cpp), str(moc)))
                 #moc.source_scanner = SCons.Defaults.CScan
         # restore the original env attributes (FIXME)
         objBuilder.env = objBuilderEnv
@@ -344,7 +347,7 @@ def generate(env):
                 else:
                     result.append(itemPath)
             return result
-        contents = node.get_contents()
+        contents = str(node.get_contents())
         includes = [included[1] for included in qrcinclude_re.findall(contents)]
         qrcpath = os.path.dirname(node.path)
         dirs = [included for included in includes if os.path.isdir(os.path.join(qrcpath,included))]
@@ -368,8 +371,30 @@ def generate(env):
     env.Append( BUILDERS = { 'Qrc': qrcbuilder } )
 
     # Interface builder
+    def addDisableWarningsPragmaToFile(target, source, env):
+        assert( len(target) == 1 )
+        assert( len(source) == 1 )
+        srcf = str(source[0])
+        dstf = str(target[0])
+        with open(dstf, 'r+') as uiHeader:
+            data=uiHeader.read()
+
+            template = Template(
+"""#pragma once
+#pragma warning(push, 0)
+#pragma GCC system_header
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
+$uiheadertext
+#pragma clang diagnostic pop
+#pragma warning(pop)
+""")
+            uiHeader.seek(0)
+            uiHeader.write(template.substitute(uiheadertext=data))
+            uiHeader.truncate()
+
     uic4builder = Builder(
-        action = SCons.Action.Action('$QT4_UICCOM', cmdstr = '$QT4_UICCOMSTR'), 
+        action = [SCons.Action.Action('$QT4_UICCOM', cmdstr = '$QT4_UICCOMSTR'), SCons.Action.Action(addDisableWarningsPragmaToFile, None)],
         src_suffix='$QT4_UISUFFIX',
         suffix='$QT4_UICDECLSUFFIX',
         prefix='$QT4_UICDECLPREFIX',
diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
index cc58666..73105ad 100644
--- a/BuildTools/SCons/Tools/textfile.py
+++ b/BuildTools/SCons/Tools/textfile.py
@@ -107,13 +107,17 @@ def _action(target, source, env):
     # write the file
     try:
         fd = open(target[0].get_path(), "wb")
-    except (OSError,IOError), e:
+    except (OSError,IOError) as e:
         raise SCons.Errors.UserError("Can't write target file %s" % target[0])
     # separate lines by 'linesep' only if linesep is not empty
     lsep = None
     for s in source:
         if lsep: fd.write(lsep)
-        fd.write(_do_subst(s, subs).encode("utf-8"))
+        stringtowrite = _do_subst(s, subs)
+        if isinstance(stringtowrite, str):
+          fd.write(stringtowrite)
+        elif isinstance(stringtowrite, unicode):
+          fd.write(stringtowrite.encode('utf-8'))
         lsep = linesep
     fd.close()
 
diff --git a/BuildTools/SCons/Tools/wix.py b/BuildTools/SCons/Tools/wix.py
index 907b6d9..889afe4 100644
--- a/BuildTools/SCons/Tools/wix.py
+++ b/BuildTools/SCons/Tools/wix.py
@@ -38,7 +38,7 @@ def generate(env) :
 
 
     light_builder = SCons.Builder.Builder(
-        action = '"$WIX_LIGHT" $WIX_LIGHT_OPTIONS -b "$WIX_SOURCE_OBJECT_DIR" ${SOURCES} -o ${TARGET}',
+        action = '"$WIX_LIGHT" $WIX_LIGHT_OPTIONS -b "$WIX_SOURCE_OBJECT_DIR" ${SOURCES} -loc Swift\\Packaging\\WiX\\Swift_en-us.wxl -o ${TARGET}',
         src_suffix = '.wixobj',
         src_builder = candle_builder)
 
@@ -48,4 +48,3 @@ def generate(env) :
 
 def exists(env) :
     return True
-