File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -267,7 +267,7 @@ if not ERRORLEVEL 1 (
267267set /p MSBUILDDIR = < " %SCRIPTDIR% \msbuild.txt"
268268del /F /Q " %SCRIPTDIR% \msbuild.txt" > nul 2 >& 1
269269if " %MSVC_VER% " == " 17" (
270- set VCTargetsPath = " ..\..\Microsoft\VC\v170\BuildCustomizations"
270+ set VCTargetsPath = " ..\..\..\ Microsoft\VC\v170\BuildCustomizations"
271271) else if " %MSVC_VER% " == " 16" (
272272 set VCTargetsPath = " ..\..\Microsoft\VC\v160\BuildCustomizations"
273273) else if " %MSVC_VER% " == " 15" (
@@ -282,8 +282,16 @@ if "%MSVC_VER%"=="17" (
282282
283283REM Convert the relative targets path to an absolute one
284284set CURRDIR = %CD%
285- pushd %MSBUILDDIR%
286- pushd %VCTargetsPath%
285+ pushd %MSBUILDDIR% 2 > nul
286+ if %ERRORLEVEL% neq 0 (
287+ echo Error: Failed to get correct msbuild path!
288+ goto Terminate
289+ )
290+ pushd %VCTargetsPath% 2 > nul
291+ if %ERRORLEVEL% neq 0 (
292+ echo Error: Unknown VCTargetsPath path!
293+ goto Terminate
294+ )
287295set VCTargetsPath = %CD%
288296popd
289297popd
You can’t perform that action at this time.
0 commit comments