Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-04-24 17:47:32 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-04-24 17:47:32 (GMT) |
| commit | 2fb37ba9d088e0027560a7d4b2b0617043569d55 (patch) | |
| tree | 160b42d97d37ea42321d1ee4b2a2dd9538a5e404 /Swift/QtUI | |
| parent | 36a00c5338df2df1be827c014dff63bfbf16cb34 (diff) | |
| download | swift-contrib-2fb37ba9d088e0027560a7d4b2b0617043569d55.zip swift-contrib-2fb37ba9d088e0027560a7d4b2b0617043569d55.tar.bz2 | |
WiX updates.
Show icon in Add/Remove programs dialog.
Support upgrading.
Render COPYING file correctly.
Resolves: #1096, #1094, #1093
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 0313f1e..ea13b8d 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -279,29 +279,29 @@ if env["PLATFORM"] == "win32" : # "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", # "/DbuildVersion=" + myenv["SWIFT_VERSION"] # ]) #myenv.Nsis("../Packaging/nsis/swift.nsi") #myenv.WiX("../Packaging/wix/swift.msi", ["../Packaging/WiX/Swift.wxs"]) 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;}\\f0\\pard\n') + 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('\\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"} wixincludecontent = "<Include>" for key in wixvariables: wixincludecontent += "<?define %s = \"%s\" ?>" % (key, wixvariables[key]) |