| 1 | *** msvc.jam
|
|---|
| 2 | --- tools/build/v2/tools/msvc.jam
|
|---|
| 3 | 149a150,173
|
|---|
| 4 | > local winsdk-vars-bat-vcinstalldir = "" ;
|
|---|
| 5 | > local winsdk-vars-bat-sdkinstalldir = "" ;
|
|---|
| 6 | >
|
|---|
| 7 | > local rule make-winsdk-vars-bat
|
|---|
| 8 | > {
|
|---|
| 9 | > local vcinstalldir = [ path.parent [ path.make $(command) ] ] ;
|
|---|
| 10 | > sdkinstalldir = [ path.parent $(vcinstalldir) ] ;
|
|---|
| 11 | > vcinstalldir = [ path.native $(vcinstalldir) ] ;
|
|---|
| 12 | > sdkinstalldir = [ path.native $(sdkinstalldir) ] ;
|
|---|
| 13 | >
|
|---|
| 14 | > winsdk-vars-bat-vcinstalldir = $(vcinstalldir) ;
|
|---|
| 15 | > winsdk-vars-bat-sdkinstalldir = $(sdkinstalldir) ;
|
|---|
| 16 | > }
|
|---|
| 17 | >
|
|---|
| 18 | >
|
|---|
| 19 | > actions quietly make-winsdk-vars-bat
|
|---|
| 20 | > {
|
|---|
| 21 | > echo @SET SDKINSTALLDIR=$(winsdk-vars-bat-sdkinstalldir)> "$(1)"
|
|---|
| 22 | > echo @SET VCINSTALLDIR=$(winsdk-vars-bat-vcinstalldir)>> "$(1)"
|
|---|
| 23 | > type "$(2)" >> "$(1)"
|
|---|
| 24 | > }
|
|---|
| 25 | >
|
|---|
| 26 | >
|
|---|
| 27 | >
|
|---|
| 28 | 237c261,266
|
|---|
| 29 | < }
|
|---|
| 30 | ---
|
|---|
| 31 | > }
|
|---|
| 32 | > else if [ MATCH "(winsdk-6.1.6000[\/\\]VC)" : $(command) ]
|
|---|
| 33 | > {
|
|---|
| 34 | > # winsdk ships same version of 8.0 as VS 2005 sp1 (14.00.60727.762)
|
|---|
| 35 | > version = 8.0 ;
|
|---|
| 36 | > }
|
|---|
| 37 | 289,291c318,335
|
|---|
| 38 | < # The vccars32.bat is actually in "bin" directory.
|
|---|
| 39 | < # (except for free VC7.1 tools)
|
|---|
| 40 | < setup = [ GLOB $(command) $(parent) : $(setup) ] ;
|
|---|
| 41 | ---
|
|---|
| 42 | > # winsdk does not ship a setup so we ship one instead
|
|---|
| 43 | > if [ MATCH "(winsdk-6.1.6000[\/\\]VC)" : $(command) ]
|
|---|
| 44 | > {
|
|---|
| 45 | > local winsdkvars-source = [ GLOB [ os.environ BOOST_BUILD_PATH ] : winsdk-6.1.6000.txt ] ;
|
|---|
| 46 | >
|
|---|
| 47 | > setup = $(winsdkvars-source:S=.bat) ;
|
|---|
| 48 | >
|
|---|
| 49 | > DEPENDS all : $(setup) ;
|
|---|
| 50 | > DEPENDS $(setup) : $(winsdkvars-source) ;
|
|---|
| 51 | > NOUPDATE $(setup) ;
|
|---|
| 52 | > make-winsdk-vars-bat $(setup) : $(winsdkvars-source) ;
|
|---|
| 53 | > }
|
|---|
| 54 | > else
|
|---|
| 55 | > {
|
|---|
| 56 | > # The vccars32.bat is actually in "bin" directory.
|
|---|
| 57 | > # (except for free VC7.1 tools)
|
|---|
| 58 | > setup = [ GLOB $(command) $(parent) : $(setup) ] ;
|
|---|
| 59 | > }
|
|---|
| 60 | *** tools/build/v2/tools/winsdk-6.1.6000.txt
|
|---|
| 61 | --- tools/build/v2/tools/winsdk-6.1.6000.txt
|
|---|
| 62 | ***************
|
|---|
| 63 | *** 0 ****
|
|---|
| 64 | --- 1,27 ----
|
|---|
| 65 | + @if "%SDKINSTALLDIR%"=="" goto error_no_VSINSTALLDIR
|
|---|
| 66 | + @if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR
|
|---|
| 67 | +
|
|---|
| 68 | + @echo Setting environment for using Microsoft Visual Studio 2005 x86 tools.
|
|---|
| 69 | +
|
|---|
| 70 | + @rem
|
|---|
| 71 | + @rem Root of Visual Studio IDE installed files.
|
|---|
| 72 | + @rem
|
|---|
| 73 | + @set DevEnvDir=%VSINSTALLDIR%\Common7\IDE
|
|---|
| 74 | +
|
|---|
| 75 | + @set PATH=%VCINSTALLDIR%\BIN;%SDKINSTALLDIR%\Bin;%PATH%
|
|---|
| 76 | + @set INCLUDE=%VCINSTALLDIR%\ATLMFC\INCLUDE;%VCINSTALLDIR%\INCLUDE;%SDKINSTALLDIR%\include;%INCLUDE%
|
|---|
| 77 | + @set LIB=%VCINSTALLDIR%\ATLMFC\LIB;%VCINSTALLDIR%\LIB;%SDKINSTALLDIR%\lib;%LIB%
|
|---|
| 78 | + @set LIBPATH=%VCINSTALLDIR%\ATLMFC\LIB
|
|---|
| 79 | +
|
|---|
| 80 | + @goto end
|
|---|
| 81 | +
|
|---|
| 82 | + :error_no_VSINSTALLDIR
|
|---|
| 83 | + @echo ERROR: VSINSTALLDIR variable is not set.
|
|---|
| 84 | + @goto end
|
|---|
| 85 | +
|
|---|
| 86 | + :error_no_VCINSTALLDIR
|
|---|
| 87 | + @echo ERROR: VCINSTALLDIR variable is not set.
|
|---|
| 88 | + @goto end
|
|---|
| 89 | +
|
|---|
| 90 | + :end
|
|---|
| 91 | +
|
|---|
