Refinement of toolchain setting script.

Author: matthew-brett

azure/set_141.cmd azure/set_vs_toolchain.cmdazure/set_141.cmd renamed to azure/set_vs_toolchain.cmd

@@ -1,11 +1,14 @@
 @@echo on
-REM set Visual Studio 2017 toolchain (v141)
+REM set Visual Studio toolchain given bitness, VS year and toolchain number.
 IF [%1] == [] GOTO NoArgErr
 set VS_BITS=%1
 IF [%2] == [] GOTO NoArgErr
 set VS_YEAR=%2
+IF [%3] == [] GOTO NoArgErr
+set VS_TOOLCHAIN=%3
 
 
+REM Tools can come from any of Professional, Community, BuildTools or Enterprise install.
 if not exist "%VSINSTALLDIR%" (
 set "VSINSTALLDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\%VS_YEAR%\Professional\"
 )
@@ -19,6 +22,7 @@ if not exist "%VSINSTALLDIR%" (
 set "VSINSTALLDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\%VS_YEAR%\Enterprise\"
 )
 
+REM Discover the latest Windows SDK available.
 call :GetWin10SdkDir
 :: dir /ON here is sorting the list of folders, such that we use the latest one that we have
 for /F %%i in ('dir /ON /B "%WindowsSdkDir%\include\10.*"') DO (
@@ -30,13 +34,20 @@ if errorlevel 1 (
     echo Windows SDK version found as: "%WindowsSDKVer%"
 )
 
-call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvars%1.bat" -vcvars_ver=14.16 %WindowsSDKVer%
+REM Set bitness, toolchain version and SDK.
+call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvars%1.bat" -vcvars_ver=%VS_TOOLCHAIN% %WindowsSDKVer%
 REM https://docs.python.org/3.9/distutils/apiref.html#module-distutils.msvccompiler
-REM Force our SDK, rather than Python's
+REM or
+REM https://setuptools.pypa.io/en/latest/deprecated/distutils/apiref.html#module-distutils.msvccompiler
+REM Force our SDK, rather than the Python was built with.
 set DISTUTILS_USE_SDK=1
 set MSSdk=1
+
+REM All done, finish here.
 goto:eof
 
+REM Various subroutines.
+
 :GetWin10SdkDir
 call :GetWin10SdkDirHelper HKLM\SOFTWARE\Wow6432Node > nul 2>&1
 if errorlevel 1 call :GetWin10SdkDirHelper HKCU\SOFTWARE\Wow6432Node > nul 2>&1
@@ -55,5 +66,6 @@ for /F "tokens=1,2*" %%i in ('reg query "%1\Microsoft\Microsoft SDKs\Windows\v10
 exit /B 0
 
 :NoArgErr
-    echo "Need to specify input bitness and VS year"
-    exit 1
+echo "Need to specify input bitness, VS year and toolchain number"
+echo "e.g 64 2019 14.16"
+exit 1

azure/windows.yml

@@ -22,8 +22,8 @@ jobs:
 
       - task: BatchScript@1
         inputs:
-          filename: azure/set_141.cmd
-          arguments: $(BITS) 2019
+          filename: azure/set_vs_toolchain.cmd
+          arguments: $(BITS) 2019 14.16
           modifyEnvironment: True
 
       - powershell: |