Ticket #6283: boost-build-msvc-11.2.patch
File boost-build-msvc-11.2.patch, 6.3 KB (added by , 11 years ago) |
---|
-
tools/build/v2/engine/build.bat
28 28 ECHO ### .\build.bat msvc 29 29 ECHO ### 30 30 ECHO ### Toolsets supported by this script are: borland, como, gcc, gcc-nocygwin, 31 ECHO ### intel-win32, metrowerks, mingw, msvc, vc7, vc8, vc9, vc10 31 ECHO ### intel-win32, metrowerks, mingw, msvc, vc7, vc8, vc9, vc10, vc11 32 32 ECHO ### 33 33 call :Set_Error 34 34 endlocal … … 101 101 if not errorlevel 1 set ProgramFiles=C:\Program Files 102 102 103 103 call :Clear_Error 104 if NOT "_%VS110COMNTOOLS%_" == "__" ( 105 set "BOOST_JAM_TOOLSET=vc11" 106 set "BOOST_JAM_TOOLSET_ROOT=%VS110COMNTOOLS%..\..\VC\" 107 goto :eof) 108 call :Clear_Error 109 if EXIST "%ProgramFiles%\Microsoft Visual Studio 11.0\VC\VCVARSALL.BAT" ( 110 set "BOOST_JAM_TOOLSET=vc11" 111 set "BOOST_JAM_TOOLSET_ROOT=%ProgramFiles%\Microsoft Visual Studio 11.0\VC\" 112 goto :eof) 113 call :Clear_Error 104 114 if NOT "_%VS100COMNTOOLS%_" == "__" ( 105 115 set "BOOST_JAM_TOOLSET=vc10" 106 116 set "BOOST_JAM_TOOLSET_ROOT=%VS100COMNTOOLS%..\..\VC\" … … 371 381 set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" 372 382 set "_known_=1" 373 383 :Skip_VC10 384 if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc11_" goto Skip_VC11 385 if NOT "_%VS110COMNTOOLS%_" == "__" ( 386 set "BOOST_JAM_TOOLSET_ROOT=%VS110COMNTOOLS%..\..\VC\" 387 ) 388 if "_%VCINSTALLDIR%_" == "__" call :Call_If_Exists "%BOOST_JAM_TOOLSET_ROOT%VCVARSALL.BAT" %BOOST_JAM_ARGS% 389 if NOT "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( 390 if "_%VCINSTALLDIR%_" == "__" ( 391 set "PATH=%BOOST_JAM_TOOLSET_ROOT%bin;%PATH%" 392 ) ) 393 set "BOOST_JAM_CC=cl /nologo /RTC1 /Zi /MTd /Fobootstrap/ /Fdbootstrap/ -DNT -DYYDEBUG -wd4996 kernel32.lib advapi32.lib user32.lib" 394 set "BOOST_JAM_OPT_JAM=/Febootstrap\jam0" 395 set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" 396 set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" 397 set "_known_=1" 398 :Skip_VC11 374 399 if NOT "_%BOOST_JAM_TOOLSET%_" == "_borland_" goto Skip_BORLAND 375 400 if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( 376 401 call :Test_Path bcc32.exe ) -
tools/build/v2/engine/build.jam
370 370 [ opt --debug : /MTd /DEBUG /Z7 /Od /Ob0 /wd4996 ] 371 371 -I$(--python-include) -I$(--extra-include) 372 372 : kernel32.lib advapi32.lib user32.lib $(--python-lib[1]) ; 373 373 toolset vc11 cl : /Fe /Fe /Fd /Fo : -D 374 : /nologo 375 [ opt --release : /MT /O2 /Ob2 /Gy /GF /GA /wd4996 ] 376 [ opt --debug : /MTd /DEBUG /Z7 /Od /Ob0 /wd4996 ] 377 -I$(--python-include) -I$(--extra-include) 378 : kernel32.lib advapi32.lib user32.lib $(--python-lib[1]) ; 379 374 380 # First set the build commands and options according to the 375 381 # preset toolset. 376 382 toolset = [ MATCH --toolset=(.*) : $(ARGV) ] ; -
tools/build/v2/tools/msvc.jam
736 736 # version from the path. 737 737 # FIXME: We currently detect both Microsoft Visual Studio 9.0 and 738 738 # 9.0express as 9.0 here. 739 if [ MATCH "(Microsoft Visual Studio 1 0)" : $(command) ]739 if [ MATCH "(Microsoft Visual Studio 11)" : $(command) ] 740 740 { 741 version = 11.0 ; 742 } 743 else if [ MATCH "(Microsoft Visual Studio 10)" : $(command) ] 744 { 741 745 version = 10.0 ; 742 746 } 743 747 else if [ MATCH "(Microsoft Visual Studio 9)" : $(command) ] … … 1351 1355 1352 1356 1353 1357 # Known toolset versions, in order of preference. 1354 .known-versions = 1 0.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;1358 .known-versions = 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ; 1355 1359 1356 1360 # Version aliases. 1357 1361 .version-alias-6 = 6.0 ; … … 1360 1364 .version-alias-8 = 8.0 ; 1361 1365 .version-alias-9 = 9.0 ; 1362 1366 .version-alias-10 = 10.0 ; 1367 .version-alias-11 = 11.0 ; 1363 1368 1364 1369 # Names of registry keys containing the Visual C++ installation path (relative 1365 1370 # to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft"). … … 1372 1377 .version-9.0express-reg = "VCExpress\\9.0\\Setup\\VC" ; 1373 1378 .version-10.0-reg = "VisualStudio\\10.0\\Setup\\VC" ; 1374 1379 .version-10.0express-reg = "VCExpress\\10.0\\Setup\\VC" ; 1380 .version-11.0-reg = "VisualStudio\\11.0\\Setup\\VC" ; 1375 1381 1376 1382 # Visual C++ Toolkit 2003 does not store its installation path in the registry. 1377 1383 # The environment variable 'VCToolkitInstallDir' and the default installation -
tools/build/v2/tools/msvc.py
646 646 # version from the path. 647 647 # FIXME: We currently detect both Microsoft Visual Studio 9.0 and 648 648 # 9.0express as 9.0 here. 649 if re.search("Microsoft Visual Studio 11", command): 650 version = '11.0' 649 651 if re.search("Microsoft Visual Studio 10", command): 650 652 version = '10.0' 651 653 elif re.search("Microsoft Visual Studio 9", command): … … 1154 1156 1155 1157 1156 1158 # Known toolset versions, in order of preference. 1157 _known_versions = ['1 0.0', '10.0express', '9.0', '9.0express', '8.0', '8.0express', '7.1', '7.1toolkit', '7.0', '6.0']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'] 1158 1160 1159 1161 # Version aliases. 1160 1162 __version_alias_6 = '6.0' … … 1163 1165 __version_alias_8 = '8.0' 1164 1166 __version_alias_9 = '9.0' 1165 1167 __version_alias_10 = '10.0' 1168 __version_alias_11 = '11.0' 1166 1169 1167 1170 # Names of registry keys containing the Visual C++ installation path (relative 1168 1171 # to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft"). … … 1175 1178 __version_9_0express_reg = "VCExpress\\9.0\\Setup\\VC" 1176 1179 __version_10_0_reg = "VisualStudio\\10.0\\Setup\\VC" 1177 1180 __version_10_0express_reg = "VCExpress\\10.0\\Setup\\VC" 1181 __version_11_0_reg = "VisualStudio\\11.0\\Setup\\VC" 1178 1182 1179 1183 # Visual C++ Toolkit 2003 does not store its installation path in the registry. 1180 1184 # The environment variable 'VCToolkitInstallDir' and the default installation