Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-11-12 19:47:14 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-11-12 19:47:43 (GMT) |
| commit | a64db9d0cbe8b838bd3d5277a2de1f9672b4b843 (patch) | |
| tree | 866575398c528af6bdaced4f09b7caeb31440f1e /Swift/QtUI/SConscript | |
| parent | 542249933a37b6cd0561456b23947c14da43a156 (diff) | |
| download | swift-a64db9d0cbe8b838bd3d5277a2de1f9672b4b843.zip swift-a64db9d0cbe8b838bd3d5277a2de1f9672b4b843.tar.bz2 | |
Install VC redistributable using .exe file.
Change-Id: I7229c38118c1ee3f4b0ef5f752e513dfd5942ba7
Diffstat (limited to 'Swift/QtUI/SConscript')
| -rw-r--r-- | Swift/QtUI/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 70a1038..5fb238a 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -332,25 +332,25 @@ if env["PLATFORM"] == "win32" : # 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() env.Command(["Swift/COPYING.rtf"], ["COPYING"], convertToRTF) wixvariables = { - 'VCCRTFile': env.get("vcredist", "c:\\Program Files\\Common Files\\Merge Modules") + "\\Microsoft_VC90_CRT_x86.msm", + 'VCCRTFile': env["vcredist"], # FIXME: Not including patch version, but that shouldn't be # a problem. It just allows downgrading between development versions 'Version': str(myenv["SWIFT_VERSION_MAJOR"]) + "." + str(myenv["SWIFT_VERSION_MINOR"]) + ".0" } 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_Heat('..\\Packaging\\WiX\\gen_files.wxs', windowsBundleFiles) myenv.WiX_Candle('..\\Packaging\\WiX\\Swift.wixobj', '..\\Packaging\\WiX\\Swift.wxs') myenv.WiX_Candle('..\\Packaging\\WiX\\gen_files.wixobj', '..\\Packaging\\WiX\\gen_files.wxs') |