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_openssl.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_openssl.py')
| -rw-r--r-- | packaging-tools/bld_openssl.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/packaging-tools/bld_openssl.py b/packaging-tools/bld_openssl.py index 428513220..ad2c8e656 100644 --- a/packaging-tools/bld_openssl.py +++ b/packaging-tools/bld_openssl.py @@ -41,21 +41,23 @@ import platform import subprocess import sys +from runner import do_execute_sub_process + ROOT_DIR = os.path.dirname(os.path.realpath(__file__)) def build(src_dir, install_dir, toolset): - bldinstallercommon.do_execute_sub_process(['perl', 'Configure', toolset, '--openssldir=' + install_dir], src_dir, True) + do_execute_sub_process(['perl', 'Configure', toolset, '--openssldir=' + install_dir], src_dir, True) if toolset == 'VC-WIN32': - bldinstallercommon.do_execute_sub_process(['ms\do_nasm.bat'], src_dir, True) + do_execute_sub_process(['ms\do_nasm.bat'], src_dir, True) else: - bldinstallercommon.do_execute_sub_process(['ms\do_win64a'], src_dir, True) - bldinstallercommon.do_execute_sub_process(['nmake', '-f', 'ms\\ntdll.mak'], src_dir, True) - bldinstallercommon.do_execute_sub_process(['nmake', '-f', 'ms\\ntdll.mak', 'install'], src_dir, True) + do_execute_sub_process(['ms\do_win64a'], src_dir, True) + do_execute_sub_process(['nmake', '-f', 'ms\\ntdll.mak'], src_dir, True) + do_execute_sub_process(['nmake', '-f', 'ms\\ntdll.mak', 'install'], src_dir, True) def archive(install_dir, archive_prefix): (dir, name) = os.path.split(install_dir) - bldinstallercommon.do_execute_sub_process(['7z', 'a', archive_prefix + '.7z', name], dir, True) - bldinstallercommon.do_execute_sub_process(['7z', 'a', archive_prefix + '-runtime.7z', '*.dll'], os.path.join(install_dir, 'bin'), True) + do_execute_sub_process(['7z', 'a', archive_prefix + '.7z', name], dir, True) + do_execute_sub_process(['7z', 'a', archive_prefix + '-runtime.7z', '*.dll'], os.path.join(install_dir, 'bin'), True) def check_environment(): FNULL = open(os.devnull, 'w') |