summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-02-12 16:16:34 (GMT)
committerTobias Markmann <tm@ayena.de>2015-02-12 16:16:34 (GMT)
commit19c05766a26a6c99385030efa262745998bba76f (patch)
treefd6ba77bcd62e241ed2ed341ed501d02ca4e8e79
parentdf2ad14297e264365c37435cf64672ea3920ea10 (diff)
downloadswift-19c05766a26a6c99385030efa262745998bba76f.zip
swift-19c05766a26a6c99385030efa262745998bba76f.tar.bz2
Fix missing to return some dependencies in windeployqt-based createWindowsBundle implementation
Test-Information: Did a clear rebuild with dist=1 and confirmed that it now starts the WiX process after all dependencies are copied over. Change-Id: Icbb9ec127b0d56e10f2620790f0fc6b6a29d5aa5
-rw-r--r--BuildTools/SCons/Tools/WindowsBundle.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index 33ace7f..10821e9 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -83,12 +83,12 @@ def generate(env) :
if qtlib.startswith("Qt5"):
(src_path, target_path) = next(((src_path, target_path) for (src_path, target_path) in qtmappings if qt_corelib_regex.match(src_path) and qt_corelib_regex.match(src_path).group(1) == qtlib), (None, None))
if src_path != None:
- env.Install(bundle, src_path)
+ all_files += env.Install(bundle, src_path)
# handle core dependencies
for (src_path, target_path) in qtmappings:
if qt_corelib_regex.match(src_path) and not qt_corelib_regex.match(src_path).group(1).startswith("Qt5"):
- env.Install(bundle, src_path)
+ all_files += env.Install(bundle, src_path)
# handle plugins
qt_plugin_regex = re.compile(ur".*plugins.*\\(.*)\\(.*)\.dll")
@@ -97,7 +97,7 @@ def generate(env) :
plugin_folder, filename = qt_plugin_regex.match(src_path).groups()
try:
if filename[1:] in qtplugins[plugin_folder]:
- env.Install(os.path.join(bundle, plugin_folder), src_path)
+ all_files += env.Install(os.path.join(bundle, plugin_folder), src_path)
except:
pass
return all_files