feat: use specific version of msvc (#17)

Author: zaucy

.github/workflows/main.yaml

@@ -22,7 +22,7 @@ jobs:
 
   build-script-windows:
     name: 'build.cmd'
-    runs-on: windows-latest
+    runs-on: windows-2025
     steps:
       - uses: actions/checkout@v4
       - run: .\build.cmd
@@ -36,7 +36,7 @@ jobs:
   build-self-windows:
     name: 'build self (windows)'
     needs: build-script-windows
-    runs-on: windows-latest
+    runs-on: windows-2025
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4

build.cmd

@@ -22,13 +22,37 @@ for /f "usebackq tokens=*" %%i in (`%vswhere% -latest -products * -requires Micr
     set vs_install_dir=%%i
 )
 
-call "%vs_install_dir%\Common7\Tools\vsdevcmd.bat" /no_logo
+if exist "%vs_install_dir%\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt" (
+    set /p Version=<"%vs_install_dir%\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt"
+    set LatestVCToolsVersion=!Version: =!
+)
+
+
+set "msvc_root=%vs_install_dir%\VC\Tools\MSVC"
+set "chosen_minor=0"
+set "chosen_patch=0"
+
+:: Iterate over all MSVC versions installed
+for /f "delims=" %%v in ('dir /b /ad "%msvc_root%"') do (
+    call :check_version "%%v"
+)
+
+if not defined chosen_version (
+    echo ERROR: MSVC version less than or equal to 14.43 not found
+    exit 1
+)
+
+echo INFO: using chosen version !chosen_version!
+
+call "%vs_install_dir%\Common7\Tools\vsdevcmd.bat" -arch=x64 -host_arch=x64 -no_logo -vcvars_ver=!chosen_version!
 
 if "%VCToolsInstallDir%"=="" (
     echo ERROR: missing VCToolsInstallDir after running vsdevcmd.bat
     exit 1
 )
 
+echo INFO: using vs tools %VCToolsVersion%
+
 set vs_tools_dir=%VCToolsInstallDir%
 
 if exist .cache\repos\cppfront\ (
@@ -152,3 +176,38 @@ cl /nologo "%root_dir%.cache/cpp2/source/src/main.cpp" ^
 if %ERRORLEVEL% neq 0 exit %ERRORLEVEL%
 
 echo %cpp2b_dist%.exe
+
+:: -------------------------------
+:: Subroutine: check_version
+:: %1 = version string like 14.43.32706
+:: -------------------------------
+:check_version
+set "ver=%~1"
+for /f "tokens=1-3 delims=." %%a in ("!ver!") do (
+    set "major=%%a"
+    set "minor=%%b"
+    set "patch=%%c"
+)
+
+if "%major%"=="14" (
+    set /a m=!minor!
+    set /a p=!patch!
+    if !m! LEQ 43 (
+        if not defined chosen_version (
+            set "chosen_version=!ver!"
+            set "chosen_minor=!m!"
+            set "chosen_patch=!p!"
+        ) else (
+            if !m! GTR !chosen_minor! (
+                set "chosen_version=!ver!"
+                set "chosen_minor=!m!"
+                set "chosen_patch=!p!"
+            ) else if !m! EQU !chosen_minor! if !p! GTR !chosen_patch! (
+                set "chosen_version=!ver!"
+                set "chosen_minor=!m!"
+                set "chosen_patch=!p!"
+            )
+        )
+    )
+)
+goto :eof

share/cpp2b/run_with_msvc_env.cmd

@@ -1,4 +1,5 @@
 @echo off
+setlocal enabledelayedexpansion
 
 set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 
@@ -7,18 +8,60 @@ for /f "usebackq tokens=*" %%i in (`%vswhere% -latest -products * -requires Micr
 )
 
 if exist "%vs_install_dir%\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt" (
-    set /p vs_tools_version=<"%vs_install_dir%\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt"
+    set /p Version=<"%vs_install_dir%\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt"
+    set LatestVCToolsVersion=!Version: =!
 )
 
-if "%vs_tools_version%"=="" (
-    echo ERROR: cannot find VC tools installed on your system
-    exit 1
+set "msvc_root=%vs_install_dir%\VC\Tools\MSVC"
+set "chosen_minor=0"
+set "chosen_patch=0"
+
+for /f "delims=" %%v in ('dir /b /ad "%msvc_root%"') do (
+    call :check_version "%%v"
 )
 
-set vs_tools_dir=%vs_install_dir%\VC\Tools\MSVC\%vs_tools_version%
+if not defined ChosenMSVC (
+    set "ChosenMSVC=%LatestVCToolsVersion%"
+)
 
-call "%vs_install_dir%\Common7\Tools\vsdevcmd.bat" /no_logo
+:: Call vsdevcmd with selected version
+call "%vs_install_dir%\Common7\Tools\vsdevcmd.bat" -arch=x64 -host_arch=x64 -no_logo -vcvars_ver=%ChosenMSVC%
 
 for /f "tokens=1,* delims= " %%a in ("%*") do set FORWARD_ARGS=%%b
 
 %1 %FORWARD_ARGS%
+
+:: -------------------------------
+:: Subroutine: check_version
+:: %1 = version string like 14.43.32706
+:: -------------------------------
+:check_version
+set "ver=%~1"
+for /f "tokens=1-3 delims=." %%a in ("!ver!") do (
+    set "major=%%a"
+    set "minor=%%b"
+    set "patch=%%c"
+)
+
+if "%major%"=="14" (
+    set /a m=!minor!
+    set /a p=!patch!
+    if !m! LEQ 43 (
+        if not defined ChosenMSVC (
+            set "ChosenMSVC=!ver!"
+            set "chosen_minor=!m!"
+            set "chosen_patch=!p!"
+        ) else (
+            if !m! GTR !chosen_minor! (
+                set "ChosenMSVC=!ver!"
+                set "chosen_minor=!m!"
+                set "chosen_patch=!p!"
+            ) else if !m! EQU !chosen_minor! if !p! GTR !chosen_patch! (
+                set "ChosenMSVC=!ver!"
+                set "chosen_minor=!m!"
+                set "chosen_patch=!p!"
+            )
+        )
+    )
+)
+goto :eof

src/main.cpp2

@@ -428,7 +428,21 @@ main: (args) -> int = {
 		if !has_msvc_env_vars() {
 			return run_with_msvc_env_vars(argz);
 		} else {
-			log_info("using vs tools {}", cpp2b::env::get_var("VCToolsVersion").expect("msvc env internal error"));
+			vc_tools_version := cpp2b::env::get_var("VCToolsVersion").expect("msvc env internal error");
+
+			after_major_index := vc_tools_version.find(".");
+			after_minor_index := vc_tools_version.find(".", after_major_index + 1);
+
+			major_version := vc_tools_version.substr(0, after_major_index).std::stoi();
+			minor_version := vc_tools_version.substr(after_major_index + 1, after_minor_index - after_major_index - 1).std::stoi();
+
+			if major_version == 14 && minor_version >= 44 {
+				log_error("vs tools version {} is unsupported", vc_tools_version);
+				log_error("please install vs tools 14.42 or 14.43");
+				std::exit(1);
+			}
+
+			log_info("using vs tools {}", vc_tools_version);
 
 			if !fs::exists(".cache/cpp2/.env") {
 				log_info("saving environment variables");