Generalized Windows Visual C++ merge module locator for Visual Studio 2017

original commit: 700c3c47ced6657924628ea0db7ee2679e50788a
This commit is contained in:
Bob Burger 2018-01-02 13:35:04 -05:00
parent 350f87ba4d
commit da9fec41e4

View File

@ -8,20 +8,18 @@
) )
@IF "%VisualStudioVersion%"=="15.0" ( @IF "%VisualStudioVersion%"=="15.0" (
@IF EXIST "%VCINSTALLDIR%Redist\MSVC\14.10.25008" ( @PUSHD "%VCINSTALLDIR%Redist\MSVC"
@SET "Path32=%VCINSTALLDIR%Redist\MSVC\14.10.25008\MergeModules\Microsoft_VC150_CRT_x86.msm" @FOR /D %%D IN (*) DO (
@SET "Path64=%VCINSTALLDIR%Redist\MSVC\14.10.25008\MergeModules\Microsoft_VC150_CRT_x64.msm" @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 (
@IF EXIST "%VCINSTALLDIR%Redist\MSVC\14.11.25325" ( SET "Path64=%VCINSTALLDIR%Redist\MSVC\%%D\%%F"
@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"
) )
@POPD
@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"
) )
@POPD
) )
@DEL vcredist.wxs >nul 2>&1 @DEL vcredist.wxs >nul 2>&1