Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-03-18 09:56:43 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2013-03-18 10:22:06 (GMT) |
| commit | 14c88d285bdac444a13dd253f9d9f02cb85eb11b (patch) | |
| tree | c0b78ecb480ee53c1e5da2389b4073456c815de7 /Swift/QtUI | |
| parent | 2061b06eccca67595c50edd81c44c5b961bf108b (diff) | |
| download | swift-contrib-14c88d285bdac444a13dd253f9d9f02cb85eb11b.zip swift-contrib-14c88d285bdac444a13dd253f9d9f02cb85eb11b.tar.bz2 | |
Add COPYING.rtf to WiX dependencies.
Change-Id: I011c803c7eadd4f74add5bbe733312ad9488c5bd
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 bfa35a5..0d69d6b 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -393,7 +393,7 @@ if env["PLATFORM"] == "win32" : outfile.write('}') outfile.close() infile.close() - env.Command(["Swift/COPYING.rtf"], ["COPYING"], convertToRTF) + copying = env.Command(["Swift/COPYING.rtf"], ["COPYING"], convertToRTF) wixvariables = { 'VCCRTFile': env["vcredist"], @@ -404,7 +404,7 @@ if env["PLATFORM"] == "win32" : 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_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') myenv.WiX_Light('#/Packages/Swift/Swift-' + myenv["SWIFT_VERSION"] + '.msi', ['..\\Packaging\\WiX\\gen_files.wixobj','..\\Packaging\\WiX\\Swift.wixobj']) |