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

Updated all the references to 14.10 and 1410 to 14.1 and 141

Browse Source
This commit is contained in:
Thomas Kent
2017-03-19 08:26:22 -05:00
parent f1e32a7884
commit 4d2dcc7278
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/reference.xml
View File

@@ -1021,7 +1021,7 @@ using gcc : &toolset_ops; ;</programlisting>
C++</ulink> command-line tools on Microsoft Windows. The supported
products and versions of command line tools are listed below:</para>
<itemizedlist>
<listitem><para>Visual Studio 2017&#x2014;14.10</para></listitem>
<listitem><para>Visual Studio 2017&#x2014;14.1</para></listitem>
<listitem><para>Visual Studio 2015&#x2014;14.0</para></listitem>
<listitem><para>Visual Studio 2013&#x2014;12.0</para></listitem>
<listitem><para>Visual Studio 2012&#x2014;11.0</para></listitem>
@@ -1037,7 +1037,7 @@ using gcc : &toolset_ops; ;</programlisting>
toolset set equal to <command>msvc-[version number]</command> for
example to build with Visual Studio 2017 one could run:
<programlisting>
.\b2 toolset=msvc-14.10 target
.\b2 toolset=msvc-14.1 target
</programlisting>
</para>

14
src/engine/build.bat
View File

@@ -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\"
)

16
src/tools/msvc.jam
View File

@@ -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 <command> : $(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").