use CUSTOM_RULE_LAUNCHER with MSVC redists, remove redist/msvc.ps1

Author: AnastaZIuk

Dockerfile

@@ -129,10 +129,6 @@ COPY --link --from=ninja ["${IMPL_ARTIFACTS_DIR}", "C:/Ninja"]
 COPY --link --from=nasm ["${IMPL_ARTIFACTS_DIR}", "C:/Nasm"]
 COPY --link --from=git ["${IMPL_ARTIFACTS_DIR}", "C:/Git"]
 
-COPY redist/msvc.ps1 msvc.ps1
-ARG MSVC_VERSION
-RUN $REDIST_PATH = 'C:/BuildTools/VC/Redist/MSVC/' + $env:MSVC_VERSION ; pwsh -File msvc.ps1 -RedistPath "$REDIST_PATH" -Arch x64
-
 ARG CMAKE_VERSION
 ARG PYTHON_VERSION
 ARG NINJA_VERSION
@@ -141,7 +137,7 @@ ARG GIT_VERSION
 ARG WINDOWS_11_SDK_VERSION
 ARG WINDOWS_SDK_VERSION
 ARG VC_VERSION
-
+ARG MSVC_VERSION
 
 ENV CMAKE_WINDOWS_KITS_10_DIR="C:\WindowsKits10SDK" `
 CMAKE_VERSION=${CMAKE_VERSION} `

cmake/winsdk-msvc-toolchain.cmake

@@ -77,6 +77,7 @@ endfunction()
 _VALIDATE_ENV_V_(LIB)
 _VALIDATE_ENV_V_(INCLUDE)
 
+# compilers/linkers
 set(CMAKE_C_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/cl.exe" CACHE FILEPATH "")
 set(CMAKE_CXX_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/cl.exe" CACHE FILEPATH "")
 set(CMAKE_ASM_COMPILER "${MSVC_TOOLSET_DIR}/bin/Host${ARCH}/${ARCH}/cl.exe" CACHE FILEPATH "")
@@ -111,4 +112,46 @@ if(EXISTS "${HINT}")
 endif()
 endmacro()
 
-_REQUEST_EXTENSION_(DIASDK_INCLUDE_DIR "${VS_INSTANCE_LOCATION}/DIA SDK/include")
+_REQUEST_EXTENSION_(DIASDK_INCLUDE_DIR "${VS_INSTANCE_LOCATION}/DIA SDK/include")
+
+# redists
+function(_REQUEST_REDIST_MODULES BASE OUTPUT)
+    if(NOT EXISTS "${BASE}")
+        message(FATAL_ERROR "Internal error, base \"${BASE}\" for redist module search directories doesn't exist - is your build tools installation corrupted?")
+    endif()
+
+    file(GLOB_RECURSE _MODULES LIST_DIRECTORIES false "${BASE}/*.dll")
+
+    set(_DIRS)
+    foreach(f IN LISTS _MODULES)
+        get_filename_component(d "${f}" DIRECTORY)
+        list(APPEND _DIRS "${d}")
+    endforeach()
+
+    list(REMOVE_DUPLICATES _DIRS)
+
+    set(${OUTPUT} "${_DIRS}")
+
+    if(NOT ${OUTPUT})
+        message(FATAL_ERROR "Internal error, no redist module search directories found (CRTs) - is your build tools installation corrupted?")
+    endif()
+
+    set(${OUTPUT} "${${OUTPUT}}" PARENT_SCOPE)
+endfunction()
+
+cmake_path(GET MSVC_TOOLSET_DIR FILENAME MSVC_VERSION)
+cmake_path(CONVERT "${VS_INSTANCE_LOCATION}/VC/Redist/MSVC/${MSVC_VERSION}" TO_CMAKE_PATH_LIST MSVC_REDIST_BASE NORMALIZE)
+_REQUEST_REDIST_MODULES("${MSVC_REDIST_BASE}/${ARCH}" RELEASE_REDISTS)
+_REQUEST_REDIST_MODULES("${MSVC_REDIST_BASE}/debug_nonredist/${ARCH}" DEBUG_REDISTS)
+set(MSVC_REDIST_MODULE_DIRECTORIES "${RELEASE_REDISTS};${DEBUG_REDISTS}" CACHE FILEPATH "MSVC Redist module search directories")
+
+# launchers
+if(WIN32)
+    set(SHELL_LAUNCHER "cmd /C")
+else()
+    set(SHELL_LAUNCHER "sh -c")
+endif()
+
+set_property(GLOBAL PROPERTY RULE_LAUNCH_CUSTOM
+  "${CMAKE_COMMAND} -E env --modify PATH=path_list_prepend:${MSVC_REDIST_MODULE_DIRECTORIES} -- ${SHELL_LAUNCHER}"
+)