From 14c88d285bdac444a13dd253f9d9f02cb85eb11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Mon, 18 Mar 2013 10:56:43 +0100
Subject: Add COPYING.rtf to WiX dependencies.

Change-Id: I011c803c7eadd4f74add5bbe733312ad9488c5bd

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'])
-- 
cgit v0.10.2-6-g49f6