From 4d2dcc72781cb1bd5be906b583ad65716fef1680 Mon Sep 17 00:00:00 2001 From: Thomas Kent Date: Sun, 19 Mar 2017 08:26:22 -0500 Subject: [PATCH] Updated all the references to 14.10 and 1410 to 14.1 and 141 --- doc/src/reference.xml | 4 ++-- src/engine/build.bat | 14 +++++++------- src/tools/msvc.jam | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/src/reference.xml b/doc/src/reference.xml index 1b03edb51..6dad2e014 100644 --- a/doc/src/reference.xml +++ b/doc/src/reference.xml @@ -1021,7 +1021,7 @@ using gcc : &toolset_ops; ; C++ command-line tools on Microsoft Windows. The supported products and versions of command line tools are listed below: - Visual Studio 2017—14.10 + Visual Studio 2017—14.1 Visual Studio 2015—14.0 Visual Studio 2013—12.0 Visual Studio 2012—11.0 @@ -1037,7 +1037,7 @@ using gcc : &toolset_ops; ; toolset set equal to msvc-[version number] for example to build with Visual Studio 2017 one could run: -.\b2 toolset=msvc-14.10 target +.\b2 toolset=msvc-14.1 target diff --git a/src/engine/build.bat b/src/engine/build.bat index a4518a764..667a30dd8 100644 --- a/src/engine/build.bat +++ b/src/engine/build.bat @@ -28,7 +28,7 @@ ECHO ### You can specify the toolset as the argument, i.e.: ECHO ### .\build.bat msvc ECHO ### ECHO ### Toolsets supported by this script are: borland, como, gcc, gcc-nocygwin, -ECHO ### intel-win32, metrowerks, mingw, msvc, vc7, vc8, vc9, vc10, vc11, vc12, vc14, vc1410 +ECHO ### intel-win32, metrowerks, mingw, msvc, vc7, vc8, vc9, vc10, vc11, vc12, vc14, vc141 ECHO ### call :Set_Error endlocal @@ -113,7 +113,7 @@ if errorlevel 1 ( call :Clear_Error REM Check the variable first. This can be set manually by the user (by running the tools commmand prompt). if NOT "_%VS150COMNTOOLS%_" == "__" ( - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%VS150COMNTOOLS%" goto :eof) :InvalidComnTools @@ -121,23 +121,23 @@ call :Clear_Error SET cl141cmd="%~dp0..\tools\vc141helper\cl141_path.cmd" for /F "tokens=*" %%A IN ('cmd /D /S /C "%cl141cmd% InstallationPath"') DO if NOT "_%%A_" == "__" ( if errorlevel 1 goto :VCFind_Error - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%%A\VC\" goto :eof) :VCFind_Error call :Clear_Error if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ( - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\" goto :eof) call :Clear_Error if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat" ( - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%VS_ProgramFiles%\Microsoft Visual Studio\2017\Professional\VC\" goto :eof) call :Clear_Error if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( - set "BOOST_JAM_TOOLSET=vc1410" + set "BOOST_JAM_TOOLSET=vc141" set "BOOST_JAM_TOOLSET_ROOT=%VS_ProgramFiles%\Microsoft Visual Studio\2017\Community\VC\" goto :eof) call :Clear_Error @@ -486,7 +486,7 @@ set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" set "_known_=1" :Skip_VC14 -if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc1410_" goto Skip_VC1410 +if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc141_" goto Skip_VC1410 if NOT "_%VS150COMNTOOLS%_" == "__" ( set "BOOST_JAM_TOOLSET_ROOT=%VS150COMNTOOLS%..\..\VC\" ) diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam index 81f2ef8a8..71662843a 100644 --- a/src/tools/msvc.jam +++ b/src/tools/msvc.jam @@ -708,7 +708,7 @@ local rule auto-detect-toolset-versions ( ) # Get installation paths from the registry. for local i in $(.known-versions) { - if $(i) = 14.10 + if $(i) = 14.1 { local file = [ path.make [ modules.binding $(__name__) ] ] ; local cl141_path = [ path.native [ path.join [ path.parent $(file) ] vc141helper cl141_path.cmd ] ] ; @@ -833,11 +833,11 @@ local rule generate-setup-cmd ( version : command : parent : options * : cpu : g } else { - if [ MATCH "(14.10)" : $(version) ] + if [ MATCH "(14.1)" : $(version) ] { if $(.debug-configuration) { - ECHO 'notice: [generate-setup-cmd] $(version) is 14.10' ; + ECHO 'notice: [generate-setup-cmd] $(version) is 14.1' ; } parent = [ path.native [ path.join $(parent) "..\\..\\..\\..\\..\\Auxiliary\\Build" ] ] ; } @@ -916,7 +916,7 @@ local rule configure-really ( version ? : options * ) local command = [ feature.get-values : $(options) ] ; - # For 14.10 we need the exact version as MS is planning rolling updates + # For 14.1 we need the exact version as MS is planning rolling updates # that will cause our `setup-cmd` to become invalid exact-version = [ MATCH "(14\.10\.[0-9\.]+)" : $(command) ] ; @@ -933,9 +933,9 @@ local rule configure-really ( version ? : options * ) # version from the path. # FIXME: We currently detect both Microsoft Visual Studio 9.0 and # 9.0express as 9.0 here. - if [ MATCH "(MSVC\\14.10)" : $(command) ] + if [ MATCH "(MSVC\\14.1)" : $(command) ] { - version = 14.10 ; + version = 14.1 ; } else if [ MATCH "(Microsoft Visual Studio 14)" : $(command) ] { @@ -1623,7 +1623,7 @@ if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ] # Known toolset versions, in order of preference. .known-versions = 14.0 12.0 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 - 7.1toolkit 7.0 6.0 14.10 ; + 7.1toolkit 7.0 6.0 14.1 ; # Version aliases. .version-alias-6 = 6.0 ; @@ -1635,7 +1635,7 @@ if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ] .version-alias-11 = 11.0 ; .version-alias-12 = 12.0 ; .version-alias-14 = 14.0 ; -.version-alias-15 = 14.10 ; +.version-alias-15 = 14.1 ; # Names of registry keys containing the Visual C++ installation path (relative # to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft").