summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/Tools/WindowsBundle.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index 7d0f4ff..e351884 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -1,19 +1,20 @@
import SCons.Util, os
def generate(env) :
- def createWindowsBundle(env, bundle, resources = [], qtimageformats = [], qtlibs = []) :
+ def createWindowsBundle(env, bundle, resources = {}, qtimageformats = [], qtlibs = []) :
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])
- for resource in resources :
- e = env.Entry(resource)
- if e.isdir() :
- for subresource in env.Glob(str(e) + "/*") :
- env.Install(os.path.join(bundle, e.name), subresource)
- else :
- env.Install(bundle, resource)
+ 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)
+ else :
+ env.Install(os.path.join(bundle, dir), resource)
env.AddMethod(createWindowsBundle, "WindowsBundle")