Ticket #8754: 0002-Boost.Build-copy-paste-MSVC-11.0-to-12.0.patch

File 0002-Boost.Build-copy-paste-MSVC-11.0-to-12.0.patch, 4.3 KB (added by Lars Viklund <zao@…>, 9 years ago)

  • tools/build/v2/tools/msvc.jam 

    From cd9c05aa5e95d8b9fdc32b73367cc35a289976b7 Mon Sep 17 00:00:00 2001
From: Lars Viklund <zao@zao.se>
Date: Tue, 2 Jul 2013 01:05:51 +0200
Subject: [PATCH 2/6] Boost.Build copy-paste MSVC 11.0 to 12.0

---
 tools/build/v2/tools/msvc.jam |  8 +++++++-
 tools/build/v2/tools/msvc.py  | 10 +++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/build/v2/tools/msvc.jam b/tools/build/v2/tools/msvc.jam
index cc04768..a1b8141 100644
    a b local rule configure-really ( version ? : options * )  
    749749            # version from the path.
    750750            # FIXME: We currently detect both Microsoft Visual Studio 9.0 and
    751751            # 9.0express as 9.0 here.
     752            if [ MATCH "(Microsoft Visual Studio 12)" : $(command) ]
     753            {
     754                version = 12.0 ;
     755            }
    752756            if [ MATCH "(Microsoft Visual Studio 11)" : $(command) ]
    753757            {
    754758                version = 11.0 ;
    … … if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]  
    13851389
    13861390
    13871391# Known toolset versions, in order of preference.
    1388 .known-versions = 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1
     1392.known-versions = 12.0 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1
    13891393    7.1toolkit 7.0 6.0 ;
    13901394
    13911395# Version aliases.
    … … if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]  
    13961400.version-alias-9 = 9.0 ;
    13971401.version-alias-10 = 10.0 ;
    13981402.version-alias-11 = 11.0 ;
     1403.version-alias-12 = 12.0 ;
    13991404
    14001405# Names of registry keys containing the Visual C++ installation path (relative
    14011406# to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft").
    … … if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]  
    14091414.version-10.0-reg = "VisualStudio\\10.0\\Setup\\VC" ;
    14101415.version-10.0express-reg = "VCExpress\\10.0\\Setup\\VC" ;
    14111416.version-11.0-reg = "VisualStudio\\11.0\\Setup\\VC" ;
     1417.version-12.0-reg = "VisualStudio\\12.0\\Setup\\VC" ;
    14121418
    14131419# Visual C++ Toolkit 2003 does not store its installation path in the registry.
    14141420# The environment variable 'VCToolkitInstallDir' and the default installation

  • tools/build/v2/tools/msvc.py 

    diff --git a/tools/build/v2/tools/msvc.py b/tools/build/v2/tools/msvc.py
index c6dab50..2cba16b 100644
    a b def configure_really(version=None, options=[]):  
    645645            # version from the path.
    646646            # FIXME: We currently detect both Microsoft Visual Studio 9.0 and
    647647            # 9.0express as 9.0 here.
    648             if re.search("Microsoft Visual Studio 11", command):
     648            if re.search("Microsoft Visual Studio 12", command):
     649                version = '12.0'
     650            elif re.search("Microsoft Visual Studio 11", command):
    649651                version = '11.0'
    650             if re.search("Microsoft Visual Studio 10", command):
     652            elif re.search("Microsoft Visual Studio 10", command):
    651653                version = '10.0'
    652654            elif re.search("Microsoft Visual Studio 9", command):
    653655                version = '9.0'
    … … __cpu_type_itanium2 = ['itanium2', 'mckinley']  
    11561158
    11571159
    11581160# Known toolset versions, in order of preference.
    1159 _known_versions = ['11.0', '10.0', '10.0express', '9.0', '9.0express', '8.0', '8.0express', '7.1', '7.1toolkit', '7.0', '6.0']
     1161_known_versions = ['12.0', '11.0', '10.0', '10.0express', '9.0', '9.0express', '8.0', '8.0express', '7.1', '7.1toolkit', '7.0', '6.0']
    11601162
    11611163# Version aliases.
    11621164__version_alias_6 = '6.0'
    … … __version_alias_8 = '8.0'  
    11661168__version_alias_9 = '9.0'
    11671169__version_alias_10 = '10.0'
    11681170__version_alias_11 = '11.0'
     1171__version_alias_12 = '12.0'
    11691172
    11701173# Names of registry keys containing the Visual C++ installation path (relative
    11711174# to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft").
    … … __version_9_0express_reg = "VCExpress\\9.0\\Setup\\VC"  
    11791182__version_10_0_reg = "VisualStudio\\10.0\\Setup\\VC"
    11801183__version_10_0express_reg = "VCExpress\\10.0\\Setup\\VC"
    11811184__version_11_0_reg = "VisualStudio\\11.0\\Setup\\VC"
     1185__version_12_0_reg = "VisualStudio\\12.0\\Setup\\VC"
    11821186
    11831187# Visual C++ Toolkit 2003 does not store its installation path in the registry.
    11841188# The environment variable 'VCToolkitInstallDir' and the default installation