*** msvc.jam
--- tools/build/v2/tools/msvc.jam
149a150,173
> local winsdk-vars-bat-vcinstalldir = "" ;
> local winsdk-vars-bat-sdkinstalldir = "" ;
> 
> local rule make-winsdk-vars-bat 
> {
>     local vcinstalldir = [ path.parent [ path.make $(command) ] ] ;
>     sdkinstalldir = [ path.parent $(vcinstalldir) ] ;
>     vcinstalldir  = [ path.native $(vcinstalldir) ] ;
>     sdkinstalldir = [ path.native $(sdkinstalldir) ] ;
> 
>     winsdk-vars-bat-vcinstalldir = $(vcinstalldir) ;
>     winsdk-vars-bat-sdkinstalldir = $(sdkinstalldir) ;
> }
> 
> 
> actions quietly make-winsdk-vars-bat
> {
>     echo @SET SDKINSTALLDIR=$(winsdk-vars-bat-sdkinstalldir)> "$(1)"
>     echo @SET VCINSTALLDIR=$(winsdk-vars-bat-vcinstalldir)>> "$(1)"
>     type "$(2)" >> "$(1)"
> }
> 
> 
> 
237c261,266
<             }                 
---
>             }
>             else if [ MATCH "(winsdk-6.1.6000[\/\\]VC)" : $(command) ]
>             {
>                 # winsdk ships same version of 8.0 as VS 2005 sp1 (14.00.60727.762)
>                 version = 8.0 ;
>             }
289,291c318,335
<                 # The vccars32.bat is actually in "bin" directory.
<                 # (except for free VC7.1 tools)
<                 setup = [ GLOB $(command) $(parent) : $(setup) ] ;
---
>                 # winsdk does not ship a setup so we ship one instead
>                 if [ MATCH "(winsdk-6.1.6000[\/\\]VC)" : $(command) ]
>                 {
>                     local winsdkvars-source = [ GLOB [ os.environ BOOST_BUILD_PATH ] : winsdk-6.1.6000.txt ] ;
> 
>                     setup = $(winsdkvars-source:S=.bat) ;
> 
>                     DEPENDS all : $(setup) ;
>                     DEPENDS $(setup) : $(winsdkvars-source) ;
>                     NOUPDATE $(setup) ;
>                     make-winsdk-vars-bat $(setup) : $(winsdkvars-source) ;
>                 }
>                 else
>                 {
>                     # The vccars32.bat is actually in "bin" directory.
>                     # (except for free VC7.1 tools)
>                     setup = [ GLOB $(command) $(parent) : $(setup) ] ;
>                 }
*** tools/build/v2/tools/winsdk-6.1.6000.txt
--- tools/build/v2/tools/winsdk-6.1.6000.txt
***************
*** 0 ****
--- 1,27 ----
+ @if "%SDKINSTALLDIR%"=="" goto error_no_VSINSTALLDIR
+ @if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR
+ 
+ @echo Setting environment for using Microsoft Visual Studio 2005 x86 tools.
+ 
+ @rem
+ @rem Root of Visual Studio IDE installed files.
+ @rem
+ @set DevEnvDir=%VSINSTALLDIR%\Common7\IDE
+ 
+ @set PATH=%VCINSTALLDIR%\BIN;%SDKINSTALLDIR%\Bin;%PATH%
+ @set INCLUDE=%VCINSTALLDIR%\ATLMFC\INCLUDE;%VCINSTALLDIR%\INCLUDE;%SDKINSTALLDIR%\include;%INCLUDE%
+ @set LIB=%VCINSTALLDIR%\ATLMFC\LIB;%VCINSTALLDIR%\LIB;%SDKINSTALLDIR%\lib;%LIB%
+ @set LIBPATH=%VCINSTALLDIR%\ATLMFC\LIB
+ 
+ @goto end
+ 
+ :error_no_VSINSTALLDIR
+ @echo ERROR: VSINSTALLDIR variable is not set. 
+ @goto end
+ 
+ :error_no_VCINSTALLDIR
+ @echo ERROR: VCINSTALLDIR variable is not set. 
+ @goto end
+ 
+ :end
+