diff options
| author | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-05-19 12:42:01 +0300 |
|---|---|---|
| committer | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-06-22 08:50:14 +0000 |
| commit | b9dcb8a30ff38459a4aad291854d74c0f2734271 (patch) | |
| tree | 692ba27cfd51fa63977ce8c1f3a08abf936fb948 /packaging-tools/bld_module.py | |
| parent | b53426a62a3b83abf105f03e557840162b08c7d9 (diff) | |
Move bldinstallercommon.do_execute_sub_process to runner.py
Moving this function since runner.py already has similar functionality
so it makes more sense to have it there.
Change-Id: Iedd4a5ba050a917258f303c21ae0edf4c30b5915
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'packaging-tools/bld_module.py')
| -rwxr-xr-x | packaging-tools/bld_module.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging-tools/bld_module.py b/packaging-tools/bld_module.py index 2098731a1..8670d5fbd 100755 --- a/packaging-tools/bld_module.py +++ b/packaging-tools/bld_module.py @@ -46,6 +46,7 @@ from bld_utils import runCommand, runBuildCommand, runInstallCommand, stripVars, import bldinstallercommon from bldinstallercommon import locate_path, locate_paths from installer_utils import PackagingError +from runner import do_execute_sub_process SCRIPT_ROOT_DIR = os.path.dirname(os.path.realpath(__file__)) MODULE_SRC_DIR_NAME = 'module_src' @@ -63,7 +64,7 @@ def patch_archive(base_dir, search_strings, qt_install_prefix): ############################### def get_qt_install_prefix(qt_path): cmd_args = [os.path.join(qt_path, 'bin', 'qmake'), '-query', 'QT_INSTALL_PREFIX'] - ret, qt_install_prefix = bldinstallercommon.do_execute_sub_process(cmd_args, qt_path, get_output=True) + ret, qt_install_prefix = do_execute_sub_process(cmd_args, qt_path, get_output=True) return qt_install_prefix.strip() ############################### |