From d04df47c5aafe519123b311ce3705b6eae511dc4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 30 Oct 2019 14:08:39 +0100 Subject: build scripts: Fix arguments handling Properly pass lists to regenerate_qt_resources(). Change-Id: I8cdd388b02a247dde915f14b21e3f3770a0c64a1 Reviewed-by: Christian Tismer --- build_scripts/platforms/unix.py | 2 +- build_scripts/platforms/windows_desktop.py | 2 +- build_scripts/utils.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 6929e915d..24a53e277 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -194,7 +194,7 @@ def prepare_packages_posix(self, vars): **vars) pyside_rcc_path = "{install_dir}/bin/rcc".format( **vars) - pyside_rcc_options = '-g python' + pyside_rcc_options = ['-g', 'python'] regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index ca198c582..01732581e 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -222,7 +222,7 @@ def prepare_packages_win32(self, vars): **vars) pyside_rcc_path = "{install_dir}/bin/rcc.exe".format( **vars) - pyside_rcc_options = '-g python' + pyside_rcc_options = ['-g', 'python'] regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 85a2f9e36..56ec8e350 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -492,9 +492,9 @@ def regenerate_qt_resources(src, pyside_rcc_path, pyside_rcc_options): if os.path.exists(dstname): log.info('Regenerating {} from {}'.format(dstname, os.path.basename(srcname))) - run_process([pyside_rcc_path, - pyside_rcc_options, - srcname, '-o', dstname]) + run_process([pyside_rcc_path] + + pyside_rcc_options + + [srcname, '-o', dstname]) def back_tick(cmd, ret_err=False): -- cgit v1.2.3