Skip to content

Commit 64a34a4

Browse files
radaretrufae
authored andcommitted
Fix preconfigure.bat regression related to local environment ##build
1 parent 1c46fc7 commit 64a34a4

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

preconfigure.bat

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,35 +110,50 @@ if %ERRORLEVEL% == 0 (
110110
for /f "tokens=*" %%i in ('"%vswherePath%" -property installationName') do (
111111
echo Visual Studio %%i is installed.
112112
)
113+
ENDLOCAL
113114
call "%VSINSTALLDIR%VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
114115
)
115116
) else if EXIST "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" (
116117
echo "Found 2022 Enterprise edition"
118+
ENDLOCAL
117119
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
118120
) else if EXIST "C:\Program Files\Microsoft Visual Studio\2022\Community" (
119121
echo "Found 2022 Community edition"
122+
ENDLOCAL
120123
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
121124
) else if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
122125
echo "Found 2022 BuildTools"
126+
ENDLOCAL
123127
call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
124128
) else if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" (
125129
echo "Found 2019 Community edition"
130+
ENDLOCAL
126131
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
127132
) else if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" (
128133
echo "Found 2019 Enterprise edition"
134+
ENDLOCAL
129135
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
130136
) else if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" (
131137
echo "Found 2019 Professional edition"
138+
ENDLOCAL
132139
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
133140
) else if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
134141
echo "Found 2019 BuildTools"
142+
ENDLOCAL
135143
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
136144
) else (
145+
ENDLOCAL
137146
echo "Not Found"
138147
exit /b 1
139148
)
140149
)
141150

151+
cl --help > NUL 2> NUL
152+
if %ERRORLEVEL% == 0 (
153+
echo CL FOUND
154+
) else (
155+
echo FAILED TO SETUP VISUAL STUDIO
156+
exit /b 1
157+
)
142158
echo Now you can run 'configure'
143-
ENDLOCAL
144159
cmd

0 commit comments

Comments
 (0)