boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity

Don't accidentally detect msvc-14.1 as msvc-14.2.

Browse Source 
- Fix copy/paste in the environmental variables.
- If vswhere exists, but doesn't find a given version, exit
  detection early and don't fall back on checking the environment.
- Clean up hackish vswhere handling.
This commit is contained in:
Steven Watanabe
2019-03-04 19:25:16 -07:00
parent 0a93cc2b97
commit 4ad28074f4
1 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/tools/msvc.jam
View File

@@ -223,6 +223,7 @@ import project ;
import property ;
import property-set ;
import rc ;
import sequence ;
import set ;
import toolset ;
import type ;
@@ -1547,55 +1548,46 @@ local rule default-path ( version )
{
# try to use vswhere
local pseudo_env_VSCOMNTOOLS ;
if $(version) = 14.2 || $(version) = "default"
local all-env-paths ;
local root = [ os.environ "ProgramFiles(x86)" ] ;
if ( ! $(root) )
{
local req = "-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64" ;
local prop = "-property installationPath" ;
local limit = "-version \"[16.0,17.0)\"" ;
local root = [ os.environ "ProgramFiles(x86)" ] ;
if ( ! $(root) )
{
root = [ os.environ "ProgramFiles" ] ;
}
local vswhere = "$(root)\\Microsoft Visual Studio\\Installer\\vswhere.exe" ;
if ( [ path.exists $(vswhere) ] )
{
local vmwhere_cmd = "\"$(vswhere)\" -latest -products * $(req) $(prop) $(limit)" ;
local shell_ret = [ SPLIT_BY_CHARACTERS [ SHELL $(vmwhere_cmd) ] : "\n" ] ;
pseudo_env_VSCOMNTOOLS = [ path.native [ path.join $(shell_ret) "\\Common7\\Tools" ] ] ;
}
root = [ os.environ "ProgramFiles" ] ;
}
else if $(version) = 14.1
local vswhere = "$(root)\\Microsoft Visual Studio\\Installer\\vswhere.exe" ;
if $(version) in 14.1 14.2 default && [ path.exists $(vswhere) ]
{
local req = "-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64" ;
local prop = "-property installationPath" ;
local limit = "-version \"[15.0,16.0)\"" ;
local root = [ os.environ "ProgramFiles(x86)" ] ;
if ( ! $(root) )
local limit ;
if $(version) = 14.2 || $(version) = "default"
{
root = [ os.environ "ProgramFiles" ] ;
limit = "-version \"[16.0,17.0)\"" ;
}
local vswhere = "$(root)\\Microsoft Visual Studio\\Installer\\vswhere.exe" ;
if ( [ path.exists $(vswhere) ] )
else if $(version) = 14.1
{
local vmwhere_cmd = "\"$(vswhere)\" -latest -products * $(req) $(prop) $(limit)" ;
local shell_ret = [ SPLIT_BY_CHARACTERS [ SHELL $(vmwhere_cmd) ] : "\n" ] ;
pseudo_env_VSCOMNTOOLS = [ path.native [ path.join $(shell_ret) "\\Common7\\Tools" ] ] ;
limit = "-version \"[15.0,16.0)\"" ;
}
local vswhere_cmd = "\"$(vswhere)\" -latest -products * $(req) $(prop) $(limit)" ;
local shell_ret = [ SPLIT_BY_CHARACTERS [ SHELL $(vswhere_cmd) ] : "\n" ] ;
pseudo_env_VSCOMNTOOLS = [ path.native [ path.join $(shell_ret) "\\Common7\\Tools" ] ] ;
if ! [ path.exists $(pseudo_env_VSCOMNTOOLS) ]
{
return ; # Not found. If we have vswhere, assume that it works.
}
all-env-paths = $(pseudo_env_VSCOMNTOOLS) ;
}
else
{
all-env-paths = [ sequence.transform os.environ
: $(.version-$(version)-env) ] ;
}
# Check environment or previous path_VS150
for local env in $(.version-$(version)-env)
for local env-path in $(all-env-paths)
{
local env-path ;
if ( $(pseudo_env_VSCOMNTOOLS) && [ path.exists $(pseudo_env_VSCOMNTOOLS) ] )
{
env-path = $(pseudo_env_VSCOMNTOOLS) ;
}
else
{
env-path = [ os.environ $(env) ] ;
}
if $(env-path) && $(.version-$(version)-path)
{
for local bin-path in $(.version-$(version)-path)
@@ -2033,9 +2025,9 @@ if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
.version-14.1-env = VS150COMNTOOLS ProgramFiles ProgramFiles(x86) ;
.version-14.2-path =
"../../VC/Tools/MSVC/*/bin/Host*/*"
"Microsoft Visual Studio/2017/*/VC/Tools/MSVC/*/bin/Host*/*"
"Microsoft Visual Studio/2019/*/VC/Tools/MSVC/*/bin/Host*/*"
;
.version-14.2-env = VS150COMNTOOLS ProgramFiles ProgramFiles(x86) ;
.version-14.2-env = VS160COMNTOOLS ProgramFiles ProgramFiles(x86) ;
# Auto-detect all the available msvc installations on the system.
auto-detect-toolset-versions ;