Download MSVC runtime instead of copying it from the build host

This effectivly reverts 36f62dd5d45b8b84bd80064ceb43bab74a89321e since
the MSVC runtime found on COIN hosts is quite old and cannot easily be
updated. Now, the downloadable artifacts are used.

Pick-to: 6.9
Task-number: PYSIDE-2938
Task-number: PYSIDE-2162
Change-Id: I228632070c92c18c60367d39c9d3540d36e7f6a2
Reviewed-by: Shyamnath Premnadh <[email protected]>

1 files changed, 2 insertions, 29 deletions

diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
index 59ca2ef91..b80acba5e 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -195,11 +195,11 @@ def prepare_packages_win32(pyside_build, _vars):
     if config.is_internal_shiboken_module_build():
         # The C++ std library dlls need to be packaged with the
         # shiboken module, because libshiboken uses C++ code.
-        copy_msvc_redist_files(destination_dir)
+        download_qt_dependency_dlls(_vars, destination_dir, msvc_redist)
 
     if config.is_internal_pyside_build() or config.is_internal_shiboken_generator_build():
         copy_qt_artifacts(pyside_build, destination_qt_dir, copy_pdbs, _vars)
-        copy_msvc_redist_files(destination_dir)
+        download_qt_dependency_dlls(_vars, destination_dir, msvc_redist)
 
 
 # MSVC redistributable file list.
@@ -217,33 +217,6 @@ msvc_redist = [
 ]
 
 
-def copy_msvc_redist_files(destination_dir):
-    if not in_coin():
-        log.info("Qt dependency DLLs (MSVC redist) will not be copied.")
-        return
-
-    # Make a directory where the files should be extracted.
-    if not destination_dir.exists():
-        destination_dir.mkdir(parents=True)
-
-    # Copy Qt dependency DLLs (MSVC) from PATH when building on Qt CI.
-    paths = os.environ["PATH"].split(os.pathsep)
-    for path in paths:
-        try:
-            for f in Path(path).glob("*140*.dll"):
-                if f.name in msvc_redist:
-                    copyfile(f, Path(destination_dir) / f.name)
-                    msvc_redist.remove(f.name)
-            if not msvc_redist:
-                break
-        except WindowsError:
-            continue
-
-    if msvc_redist:
-        msg = "The following Qt dependency DLLs (MSVC redist) were not found: {msvc_redist}"
-        raise FileNotFoundError(msg)
-
-
 def get_cache_dir():
     """Return the name of a cache directory for storing artifacts for repetitive
        runs of setup.py depending on COIN_UNIQUE_JOB_ID."""