fix bfgroup#157: update detect vs2017+ scripts to v1.11.2

Author: refack

src/engine/config_toolset.bat

@@ -165,9 +165,9 @@ if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
     if NOT "_%VS150COMNTOOLS%_" == "__" (
         set "BOOST_JAM_TOOLSET_ROOT=%VS150COMNTOOLS%..\..\VC\"
     ))
-SET cl_path_cmd="%~dp0..\tools\vc141helper\cl_path.cmd"
+SET vsCOMhelper_cmd="%~dp0..\tools\vsCOMhelper\get_key_helper.cmd" "IsVcCompatible,VisualCppToolsVersionMinor=14.10" "InstallationPath"
 if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
-    for /f "tokens=*" %%A in ('cmd /D /S /C "%cl_path_cmd% 14.10"') do if NOT errorlevel 1 if NOT "_%%A_" == "__" (
+    for /f "tokens=*" %%A in ('cmd /D /S /C "%vsCOMhelper_cmd%"') do if NOT errorlevel 1 if NOT "_%%A_" == "__" (
         set "BOOST_JAM_TOOLSET_ROOT=%%A\VC\"))
 
 REM vc1410 vsvarsall requires the architecture as a parameter.

src/engine/guess_toolset.bat

@@ -32,11 +32,21 @@ if NOT "_%VS150COMNTOOLS%_" == "__" (
     set "BOOST_JAM_TOOLSET=vc1410"
     set "BOOST_JAM_TOOLSET_ROOT=%VS150COMNTOOLS%..\..\VC\"
     goto :eof)
-SET cl_path_cmd="%~dp0..\tools\vc141helper\cl_path.cmd"
-for /f "tokens=*" %%A in ('cmd /D /S /C "%cl_path_cmd% 14.10"') do if NOT errorlevel 1 if NOT "_%%A_" == "__" (
-    set "BOOST_JAM_TOOLSET=vc1410"
-    set "BOOST_JAM_TOOLSET_ROOT=%%A\VC\"
+SET vsCOMhelper_cmd="%~dp0..\tools\vsCOMhelper\get_key_helper.cmd" IsVcCompatible InstallationPath
+for /f "tokens=*" %%A in ('cmd /D /S /C "%vsCOMhelper_cmd% InstallationPath"') do vsCOMhelper_2 %%A
+IF NOT DEFINED BOOST_JAM_TOOLSET goto :After_vsCOMhelper
+IF NOT DEFINED BOOST_JAM_TOOLSET_ROOT goto :After_vsCOMhelper
+goto :eof
+
+:vsCOMhelper_2
+IF "_%1_"=="__" goto :eof
+set "BOOST_JAM_TOOLSET_ROOT=%1\VC\"
+for /f "tokens=*" %%A in ('cmd /D /S /C "%vsCOMhelper_cmd% VCToolsVersionCode"') do if NOT "_%%A_"="__" (
+    set "BOOST_JAM_TOOLSET=%%A"
     goto :eof)
+goto :eof
+
+:After_vsCOMhelper
 if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"  (
     set "BOOST_JAM_TOOLSET=vc1410"
     set "BOOST_JAM_TOOLSET_ROOT=%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\"

src/tools/msvc.jam

@@ -711,8 +711,8 @@ local rule auto-detect-toolset-versions ( )
             if $(i) = 14.10
             {
                 local file = [ path.make [ modules.binding $(__name__) ] ] ;
-                local cl_path = [ path.native [ path.join [ path.parent $(file) ] vc141helper cl_path.cmd ] ] ;
-                local shell_ret = [ SHELL "$(cl_path) 14.10 -PathToCompiler" ] ;
+                local vsCOMhelper_path = [ path.native [ path.join [ path.parent $(file) ] vsCOMhelper get_key_helper.cmd ] ] ;
+                local shell_ret = [ SHELL "\"$(vsCOMhelper_path)\" \"IsVcCompatible,VisualCppToolsVersionMinor=$(i)\" VisualCppTools" ] ;
                 local cl_path = $(shell_ret:D) ;
                 if $(cl_path)
                 {

src/tools/vc141helper/GetCLPath.ps1

@@ -0,0 +1,29 @@
+# Copyright 2017 - Refael Ackermann
+# Distributed under MIT style license
+# See accompanying file LICENSE at https://github.com/node4good/windows-autoconf
+# version: 1.11.1
+
+param (
+    [Parameter(Mandatory=$false)]
+    [string[]]$filters = "IsVcCompatible",
+    [Parameter(Mandatory=$false)]
+    [string[]]$keys = "VisualCppToolsCL"
+)
+if (-NOT (Test-Path 'Registry::HKEY_CLASSES_ROOT\CLSID\{177F0C4A-1CD3-4DE7-A32C-71DBBB9FA36D}')) { Exit 1 }
+Add-Type -Path GetVS2017Configuration.cs;
+$insts = [VisualStudioConfiguration.ComSurrogate]::QueryEx()
+foreach ($filter in $filters) {
+    if ($filter -ne "*") {
+        if ($filter -like "*=*") {
+            $parts = $filter -Split "=";
+            $filter = $parts[0];
+            $criteria = $parts[1];
+            $insts = $insts | where { $_.Get($filter) -eq $criteria }
+        } else {
+            $insts = $insts | where { $_.Get($filter) }
+        }
+    }
+}
+foreach ($key in $keys) {
+    if ($key -eq "*") { $insts | echo } else { $insts | % { $_.Get($key) } }
+}