From da9fec41e4cb996417bfc6bc16c6900baa1d124c Mon Sep 17 00:00:00 2001 From: Bob Burger Date: Tue, 2 Jan 2018 13:35:04 -0500 Subject: [PATCH] Generalized Windows Visual C++ merge module locator for Visual Studio 2017 original commit: 700c3c47ced6657924628ea0db7ee2679e50788a --- wininstall/locate-vcredist.bat | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/wininstall/locate-vcredist.bat b/wininstall/locate-vcredist.bat index c31aeba68b..f9b39cbf3e 100755 --- a/wininstall/locate-vcredist.bat +++ b/wininstall/locate-vcredist.bat @@ -8,20 +8,18 @@ ) @IF "%VisualStudioVersion%"=="15.0" ( - @IF EXIST "%VCINSTALLDIR%Redist\MSVC\14.10.25008" ( - @SET "Path32=%VCINSTALLDIR%Redist\MSVC\14.10.25008\MergeModules\Microsoft_VC150_CRT_x86.msm" - @SET "Path64=%VCINSTALLDIR%Redist\MSVC\14.10.25008\MergeModules\Microsoft_VC150_CRT_x64.msm" - ) - - @IF EXIST "%VCINSTALLDIR%Redist\MSVC\14.11.25325" ( - @SET "Path32=%VCINSTALLDIR%Redist\MSVC\14.11.25325\MergeModules\Microsoft_VC141_CRT_x86.msm" - @SET "Path64=%VCINSTALLDIR%Redist\MSVC\14.11.25325\MergeModules\Microsoft_VC141_CRT_x64.msm" - ) - - @IF EXIST "%VCINSTALLDIR%Redist\MSVC\14.12.25810" ( - @SET "Path32=%VCINSTALLDIR%Redist\MSVC\14.12.25810\MergeModules\Microsoft_VC141_CRT_x86.msm" - @SET "Path64=%VCINSTALLDIR%Redist\MSVC\14.12.25810\MergeModules\Microsoft_VC141_CRT_x64.msm" + @PUSHD "%VCINSTALLDIR%Redist\MSVC" + @FOR /D %%D IN (*) DO ( + @PUSHD %%D + @FOR %%F IN (MergeModules\Microsoft_VC*_CRT_x86.msm) DO ( + SET "Path32=%VCINSTALLDIR%Redist\MSVC\%%D\%%F" + ) + @FOR %%F IN (MergeModules\Microsoft_VC*_CRT_x64.msm) DO ( + SET "Path64=%VCINSTALLDIR%Redist\MSVC\%%D\%%F" + ) + @POPD ) + @POPD ) @DEL vcredist.wxs >nul 2>&1