summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-10-07 09:10:30 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-10-07 09:10:30 (GMT)
commitb01e339e89143684f7f1406bf3ce07481e98b5bc (patch)
tree906668380cea28070550ed96f0dca15bd8e8e91f /BuildTools/SCons
parentde3228cf736a154ebfebe55e972e451211bf0df0 (diff)
downloadswift-b01e339e89143684f7f1406bf3ce07481e98b5bc.zip
swift-b01e339e89143684f7f1406bf3ce07481e98b5bc.tar.bz2
Fixed & cleaned up some of the WiX stuff.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/Tools/WindowsBundle.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index e351884..c3c77aa 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -2,19 +2,21 @@ import SCons.Util, os
def generate(env) :
def createWindowsBundle(env, bundle, resources = {}, qtimageformats = [], qtlibs = []) :
- env.Install(bundle, bundle + ".exe")
+ all_files = []
+ all_files += env.Install(bundle, bundle + ".exe")
for lib in qtlibs :
- env.Install(bundle, os.path.join(env["QTDIR"], "bin", lib + ".dll"))
- env.Install(os.path.join(bundle, "imageformats"), [os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + "4.dll") for codec in qtimageformats])
+ all_files += env.Install(bundle, os.path.join(env["QTDIR"], "bin", lib + ".dll"))
+ all_files += env.Install(os.path.join(bundle, "imageformats"), [os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + "4.dll") for codec in qtimageformats])
for dir, resourceFiles in resources.items() :
for resource in resourceFiles :
e = env.Entry(resource)
if e.isdir() :
for subresource in env.Glob(str(e) + "/*") :
- env.Install(os.path.join(bundle, dir, e.name), subresource)
+ all_files += env.Install(os.path.join(bundle, dir, e.name), subresource)
else :
- env.Install(os.path.join(bundle, dir), resource)
+ all_files += env.Install(os.path.join(bundle, dir), resource)
+ return all_files
env.AddMethod(createWindowsBundle, "WindowsBundle")