1 files changed, 9 insertions, 2 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index ff97b42..77731df 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -30,61 +30,61 @@ myenv.UseFlags(env["SWIFT_CONTROLLERS_FLAGS"])
 myenv.UseFlags(env["SWIFTOOLS_FLAGS"])
 if myenv["HAVE_XSS"] :
     myenv.UseFlags(env["XSS_FLAGS"])
 if env["PLATFORM"] == "posix" :
     myenv.Append(LIBS = ["X11"])
 if myenv["HAVE_SPARKLE"] :
     myenv.UseFlags(env["SPARKLE_FLAGS"])
 myenv.UseFlags(env["SWIFTEN_FLAGS"])
 myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
 if myenv.get("HAVE_BREAKPAD") :
     myenv.UseFlags(env["BREAKPAD_FLAGS"])
 if myenv.get("HAVE_GROWL", False) :
     myenv.UseFlags(myenv["GROWL_FLAGS"])
     myenv.Append(CPPDEFINES = ["HAVE_GROWL"])
 if myenv["swift_mobile"] :
     myenv.Append(CPPDEFINES = ["SWIFT_MOBILE"])
 if myenv.get("HAVE_HUNSPELL", True):
     myenv.Append(CPPDEFINES = ["HAVE_HUNSPELL"])
     myenv.UseFlags(myenv["HUNSPELL_FLAGS"])
 if env["PLATFORM"] == "win32" :
     myenv.Append(LIBS = ["cryptui"])
 myenv.UseFlags(myenv["PLATFORM_FLAGS"])
 
 myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
 myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
 myenv.Tool("wix", toolpath = ["#/BuildTools/SCons/Tools"])
 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" :
         qt4modules += ['QtX11Extras']
 else :
     qt_version = '4'
 if env["PLATFORM"] == "posix" :
     qt4modules += ["QtDBus"]
 if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
     qt4modules += ["QtNetwork"]
 
 myenv.EnableQt4Modules(qt4modules, debug = False, version = qt_version)
 
 
 ## Qt related unit tests
 testQtEnv = env.Clone();
 testQtEnv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
 testQtEnv.EnableQt4Modules(qt4modules, debug = False, version = qt_version)
 env["SWIFT_QTUI_TEST_FLAGS"] = {}
 for key in ["CCFLAGS", "CPPFLAGS", "CPPPATH", "CPPDEFINES", "LIBS", "LINKFLAGS", "LIBPATH"] :
     if key in testQtEnv:
         env["SWIFT_QTUI_TEST_FLAGS"][key] = testQtEnv[key]
 
 env.Append(UNITTEST_SOURCES = [
     File("UnitTest/QtUtilitiesTest.cpp")
 ])
 
 myenv.Append(CPPPATH = ["."])
 
 # Qt requires applications to be build with the -fPIC flag on some 32-bit Linux distributions.
@@ -451,52 +451,59 @@ if env["PLATFORM"] == "win32" :
                  resources = commonResources,
                  qtplugins = qtplugins,
                  qtlibs = qtlibs,
                  qtversion = qt_version)
 
     if env["DIST"] :
         #myenv.Append(NSIS_OPTIONS = [
         #    "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"",
         #    "/DbuildVersion=" + myenv["SWIFT_VERSION"]
         #  ])
         #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')
                 outfile.write('{\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\fs16\\f0\\pard\n')
                 for line in infile:
                     for char in line.decode("utf-8") :
                         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
                             # work
                             outfile.write("\\'%X" % ord(char))
                         else :
                             outfile.write(char)
                     outfile.write('\\par ')
                 outfile.write('}')
                 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:
                 wixincludecontent += "<?define %s = \"%s\" ?>" % (key, wixvariables[key])
             wixincludecontent += "</Include>"
             myenv.WriteVal("..\\Packaging\\Wix\\variables.wxs", env.Value(wixincludecontent))
             myenv["WIX_SOURCE_OBJECT_DIR"] = "Swift\\QtUI\\Swift"
             myenv.WiX_Heat('..\\Packaging\\WiX\\gen_files.wxs', windowsBundleFiles + copying)
             myenv.WiX_Candle('..\\Packaging\\WiX\\Swift.wixobj', '..\\Packaging\\WiX\\Swift.wxs')
             myenv.WiX_Candle('..\\Packaging\\WiX\\gen_files.wixobj', '..\\Packaging\\WiX\\gen_files.wxs')
             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]))
 
                 myenv.AddPostAction(lightTask, signToolAction)
 
             if myenv["debug"] :
                 myenv.InstallAs('#/Packages/Swift/Swift-' + myenv["SWIFT_VERSION"] + '.pdb', "Swift.pdb")