Use wildcard to find crt dll in BuildWindowsBits.cmd

This commit is contained in:
rentu 2019-06-11 08:10:47 +01:00
Родитель e3f147bb4f
Коммит af0c0cee6d
1 изменённых файлов: 5 добавлений и 6 удалений

Просмотреть файл

@ -4,24 +4,23 @@ SETLOCAL EnableDelayedExpansion
set PROJECT_PATH=%1 set PROJECT_PATH=%1
set PROJECT_OUTPUT_PATH=%2 set PROJECT_OUTPUT_PATH=%2
set PROJECT_CONFIGURATION="%3" set PROJECT_CONFIGURATION="%3"
set VS_CRT_REDIST_REL[0]="%VcToolsRedistDir%onecore\x64\Microsoft.VC141.CRT"
set VS_CRT_REDIST_REL[1]="%VcToolsRedistDir%onecore\x64\Microsoft.VC150.CRT"
set UCRT_DLL_PATH="%WindowsSdkVerBinPath%\x64\ucrt" set UCRT_DLL_PATH="%WindowsSdkVerBinPath%\x64\ucrt"
set VS_CRT_REDIST_WILDCARD_FOLDER= ("%VcToolsRedistDir%onecore\x64\Microsoft.VC*.CRT")
:: Check execution environment :: Check execution environment
if "%VSINSTALLDIR%" == "" ( if "%VSINSTALLDIR%" == "" (
goto RunFromDevCmd goto RunFromDevCmd
) )
for /L %%n in (0,1,1) do ( for /D %%A in %VS_CRT_REDIST_WILDCARD_FOLDER% do (
call robocopy.exe !VS_CRT_REDIST_REL[%%n]! %PROJECT_OUTPUT_PATH% /S /E >nul call robocopy.exe "%%~A" %PROJECT_OUTPUT_PATH% /S /E >nul
if !ERRORLEVEL! LEQ 8 ( if !ERRORLEVEL! LEQ 8 (
goto StageResistRelOk goto StageResistRelOk
) )
) )
echo Error while staging debugger binaries. Exiting... echo Error while staging debugger binaries. Exiting...
exit /b 1 exit /b 1
:StageResistRelOk :StageResistRelOk
call robocopy.exe %UCRT_DLL_PATH% %PROJECT_OUTPUT_PATH% /S /E >nul call robocopy.exe %UCRT_DLL_PATH% %PROJECT_OUTPUT_PATH% /S /E >nul