File tree Expand file tree Collapse file tree 1 file changed +5
-8
lines changed Expand file tree Collapse file tree 1 file changed +5
-8
lines changed Original file line number Diff line number Diff line change 1
1
@ echo off
2
+ setlocal enabledelayedexpansion
2
3
3
4
set root_dir = %~dp0
4
5
set tools_dir = %~dp0 .cache\tools\
@@ -21,25 +22,21 @@ for /f "usebackq tokens=*" %%i in (`%vswhere% -latest -products * -requires Micr
21
22
set vs_install_dir = %%i
22
23
)
23
24
24
- if exist " %vs_install_dir% \VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt" (
25
- set /p vs_tools_version = < " %vs_install_dir% \VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt"
26
- )
25
+ call " %vs_install_dir% \Common7\Tools\vsdevcmd.bat" /no_logo
27
26
28
- if " %vs_tools_version % " == " " (
29
- echo ERROR: cannot find VC tools installed on your system
27
+ if " %VCToolsInstallDir % " == " " (
28
+ echo ERROR: missing VCToolsInstallDir after running vsdevcmd.bat
30
29
exit 1
31
30
)
32
31
33
- set vs_tools_dir = %vs_install_dir% \VC\Tools\MSVC\ %vs_tools_version %
32
+ set vs_tools_dir = %VCToolsInstallDir %
34
33
35
34
if exist .cache\repos\cppfront\ (
36
35
@ rem TODO - report which cppfront version is being used
37
36
) else (
38
37
git clone --quiet --branch=v0.8.1 --depth=1 https://github.com/hsutter/cppfront.git .cache/repos/cppfront
39
38
)
40
39
41
- call " %vs_install_dir% \Common7\Tools\vsdevcmd.bat" /no_logo
42
-
43
40
if not exist " %modules_dir% \std.ifc" (
44
41
echo Compiling std module...
45
42
pushd %modules_dir%
You can’t perform that action at this time.
0 commit comments