diff -wurx '(*wrong_line_ends_test.cpp|*.obj|*.o|*.gil*|*.lib|*.bin.v2|*.exe|*.ilk|*.pdb)' ../diffable_boost_1_34_1/boost/config/auto_link.hpp ../boost_libraries/boost/config/auto_link.hpp --- ../diffable_boost_1_34_1/boost/config/auto_link.hpp 2005-12-07 19:11:42.000000000 -0800 +++ ../boost_libraries/boost/config/auto_link.hpp 2007-11-27 13:15:51.828125000 -0800 @@ -130,11 +130,16 @@ // vc71: # define BOOST_LIB_TOOLSET "vc71" -#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1400) +#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1400) // vc80: # define BOOST_LIB_TOOLSET "vc80" +#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1500) + + // vc90: +# define BOOST_LIB_TOOLSET "vc90" + #elif defined(__BORLANDC__) // CBuilder 6: diff -wurx '(*wrong_line_ends_test.cpp|*.obj|*.o|*.gil*|*.lib|*.bin.v2|*.exe|*.ilk|*.pdb)' ../diffable_boost_1_34_1/boost/config/compiler/visualc.hpp ../boost_libraries/boost/config/compiler/visualc.hpp --- ../diffable_boost_1_34_1/boost/config/compiler/visualc.hpp 2006-01-13 02:48:08.000000000 -0800 +++ ../boost_libraries/boost/config/compiler/visualc.hpp 2007-11-27 13:15:52.656250000 -0800 @@ -168,8 +168,8 @@ #error "Compiler not supported or configured - please reconfigure" #endif // -// last known and checked version is 1400 (VC8): -#if (_MSC_VER > 1400) +// last known and checked version is 1500 (VC9): +#if (_MSC_VER > 1500) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else diff -wurx '(*wrong_line_ends_test.cpp|*.obj|*.o|*.gil*|*.lib|*.bin.v2|*.exe|*.ilk|*.pdb)' ../diffable_boost_1_34_1/boost/range/detail/implementation_help.hpp ../boost_libraries/boost/range/detail/implementation_help.hpp --- ../diffable_boost_1_34_1/boost/range/detail/implementation_help.hpp 2006-10-24 03:36:52.000000000 -0700 +++ ../boost_libraries/boost/range/detail/implementation_help.hpp 2007-12-06 13:28:36.031250000 -0800 @@ -110,28 +110,64 @@ { return str_end( s ) - s; } + /* + ADOBE (sparent@adobe.com) 1464 : Using unused parameter to silence warnings. + */ + template + inline void adobe_boost_range_size_unused(const T&) { } + /* + END ADOBE + */ template< class T, std::size_t sz > inline std::size_t array_size( T BOOST_RANGE_ARRAY_REF()[sz], int ) { + /* + ADOBE (sparent@adobe.com) 1464 : Using unused parameter to silence warnings. + */ + adobe_boost_range_size_unused(boost_range_array); + /* + END ADOBE + */ return sz; } template< class T, std::size_t sz > inline std::size_t array_size( const T BOOST_RANGE_ARRAY_REF()[sz], int ) { + /* + ADOBE (sparent@adobe.com) 1464 : Using unused parameter to silence warnings. + */ + adobe_boost_range_size_unused(boost_range_array); + /* + END ADOBE + */ return sz; } template< class T, std::size_t sz > inline std::size_t array_size( T BOOST_RANGE_ARRAY_REF()[sz], char_or_wchar_t_array_tag ) { + /* + ADOBE (sparent@adobe.com) 1464 : Using unused parameter to silence warnings. + */ + adobe_boost_range_size_unused(boost_range_array); + /* + END ADOBE + */ return sz - 1; } template< class T, std::size_t sz > inline std::size_t array_size( const T BOOST_RANGE_ARRAY_REF()[sz], char_or_wchar_t_array_tag ) { + /* + ADOBE (sparent@adobe.com) 1464 : Using unused parameter to silence warnings. + */ + adobe_boost_range_size_unused(boost_range_array); + /* + END ADOBE + */ return sz - 1; } diff -wurx '(*wrong_line_ends_test.cpp|*.obj|*.o|*.gil*|*.lib|*.bin.v2|*.exe|*.ilk|*.pdb)' ../diffable_boost_1_34_1/libs/serialization/borland6ide/test_simple_class.bpf ../boost_libraries/libs/serialization/borland6ide/test_simple_class.bpf --- ../diffable_boost_1_34_1/libs/serialization/borland6ide/test_simple_class.bpf 2004-07-10 18:11:22.000000000 -0700 +++ ../boost_libraries/libs/serialization/borland6ide/test_simple_class.bpf 2007-09-15 13:05:26.624750000 -0700 @@ -1,3 +1,4 @@ This file is used by the project manager only and should be treated like the project file + main \ No newline at end of file diff -wurx '(*wrong_line_ends_test.cpp|*.obj|*.o|*.gil*|*.lib|*.bin.v2|*.exe|*.ilk|*.pdb)' ../diffable_boost_1_34_1/tools/build/v2/tools/builtin.jam ../boost_libraries/tools/build/v2/tools/builtin.jam --- ../diffable_boost_1_34_1/tools/build/v2/tools/builtin.jam 2007-03-14 21:02:24.000000000 -0700 +++ ../boost_libraries/tools/build/v2/tools/builtin.jam 2007-11-20 21:48:50.140625000 -0800 @@ -205,6 +205,13 @@ power # MIPS/SGI mips1 mips2 mips3 mips4 mips32 mips32r2 mips64 +# ADOBE patch for universal (combined binaries), with help from grafik + # Combined architectures for platforms/toolsets that support + # building for multiple architectures at once. "combined" + # would be the default multi-arch for the toolset. + combined + combined-x86-power +#end ADOBE patch # : propagated optional ; diff -wurx '(*wrong_line_ends_test.cpp|*.obj|*.o|*.gil*|*.lib|*.bin.v2|*.exe|*.ilk|*.pdb)' ../diffable_boost_1_34_1/tools/build/v2/tools/darwin.jam ../boost_libraries/tools/build/v2/tools/darwin.jam --- ../diffable_boost_1_34_1/tools/build/v2/tools/darwin.jam 2007-03-14 21:02:23.000000000 -0700 +++ ../boost_libraries/tools/build/v2/tools/darwin.jam 2007-12-05 12:59:58.265625000 -0800 @@ -1,6 +1,9 @@ # Copyright 2003 Christopher Currie # Copyright 2006 Dave Abrahams # Copyright 2003, 2004, 2005, 2006 Vladimir Prus +# Copyright 2005-2007 Mat Marcus +# Copyright 2005-2007 Adobe Systems Incorporated +# Copyright 2007 Rene Rivera # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) @@ -12,8 +15,9 @@ import type ; import common ; import generators ; +import path : basename ; -toolset.register darwin ; +feature.extend toolset : darwin ; import gcc ; toolset.inherit-generators darwin : gcc ; @@ -22,10 +26,13 @@ toolset.inherit-rules darwin : gcc ; toolset.inherit-flags darwin : gcc - : # On Darwin, static runtime is just not supported. So don't inherit - # any flags settings for static - static - ; + : static + x86/32 + x86/64 + x86/ + power/32 + power/64 + power/ ; # No additional initialization should be necessary rule init ( version ? : command * : options * ) @@ -39,7 +46,7 @@ local gccversion = [ SHELL "$(command) -dumpversion" ] ; if $(gccversion) < "4.0.0" { - flags darwin.compile.c++ OPTIONS : -fcoalesce-templates ; + flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ; } gcc.init-link-flags darwin darwin $(condition) ; @@ -49,8 +56,109 @@ feature framework : : free ; +# The following adds objective-c support to darwin. +# Thanks to http://thread.gmane.org/gmane.comp.lib.boost.build/13759 + +type.register OBJECTIVE_C : m ; +type.register OBJECTIVE_CPP : mm ; + +generators.register-c-compiler darwin.compile.m : OBJECTIVE_C : OBJ : darwin ; +generators.register-c-compiler darwin.compile.mm : OBJECTIVE_CPP : OBJ : darwin ; + +rule compile.m +{ + LANG on $(<) = "-x objective-c" ; +} + +actions compile.m +{ + "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" +} + +rule compile.mm +{ + LANG on $(<) = "-x objective-c++" ; +} + +actions compile.mm +{ + "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" +} + +# Determine the MacOSX SDK versions installed and their locations. +local rule available-macosx-versions ( ) +{ + local sdks = [ GLOB /Developer/SDKs : MacOSX* ] ; + for local sdk in $(sdks) + { + local sdk-version = [ MATCH ([0-9]+)[.]([0-9]+)[.]?([0-9]+)? : $(sdk:D=) ] ; + sdk-version = $(sdk-version:J=.) ; + if $(sdk-version) + { + .macosx-sdk = $(sdk-version) $(.macosx-sdk) ; + .macosx-sdk.$(sdk-version) = $(sdk) ; + } + } + return $(.macosx-sdk) ; +} + +# Add the found SDK version only to the allowed set. The "latests" SDKs +# wil be first in the list, and hence the default. +feature macosx-version + : [ available-macosx-versions ] + : propagated link-incompatible symmetric ; +if 10.4 in [ feature.values macosx-version ] +{ + feature.set-default macosx-version : 10.4 ; +} + +# Add the options for all the found SDKs. +for local sdk in $(.macosx-sdk) +{ + flags darwin.compile OPTIONS $(sdk) : + -isysroot $(.macosx-sdk.$(sdk)) + -mmacosx-version-min=$(sdk) + ; + flags darwin.link OPTIONS $(sdk) : + -isysroot $(.macosx-sdk.$(sdk)) + -mmacosx-version-min=$(sdk) + ; +} + +# Add option selection for combined and specific architecture combinations. + +local rule arch-addr-flags ( toolset variable + : architecture : address-model + : values + : default ? ) +{ + if $(default) + { + flags $(toolset) $(variable) + $(architecture)/ + : $(values) ; + } + flags $(toolset) $(variable) + /$(address-model) + $(architecture)/$(address-model) + : $(values) ; +} + +arch-addr-flags darwin OPTIONS : combined : 32 : -arch i386 -arch ppc : default ; +arch-addr-flags darwin OPTIONS : combined : 64 : -arch x86_64 -arch ppc64 ; + +arch-addr-flags darwin OPTIONS : x86 : 32 : -arch i386 : default ; +arch-addr-flags darwin OPTIONS : x86 : 64 : -arch x86_64 ; + +arch-addr-flags darwin OPTIONS : power : 32 : -arch ppc : default ; +arch-addr-flags darwin OPTIONS : power : 64 : -arch ppc64 ; + + +flags darwin.link OPTIONS static + : -nodefaultlibs -shared-libgcc -lstdc++-static -lgcc_eh -lgcc -lSystem ; + +flags darwin.link OPTIONS release : -Wl,-dead_strip -no_dead_strip_inits_and_terms ; + flags darwin.compile OPTIONS shared : -dynamic ; -flags darwin.compile OPTIONS : -Wno-long-double -no-cpp-precomp ; +flags darwin.compile OPTIONS : -Wno-long-double -no-cpp-precomp -gdwarf-2 ; flags darwin.link FRAMEWORK ; @@ -86,11 +194,12 @@ actions link.dll bind LIBRARIES { - $(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS) + $(CONFIG_COMMAND) -dynamiclib -install_name "$(<:B)$(<:S)" -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS) } +# We use libtool instead of ar to support universal binary linking +# TODO: Find a way to use the underlying tools, i.e. lipo, to do this. actions piecemeal archive { - ar -c -r -s $(ARFLAGS) "$(<:T)" "$(>:T)" + libtool -static -o "$(<:T)" $(ARFLAGS) "$(>:T)" } - diff -wurx '(*wrong_line_ends_test.cpp|*.obj|*.o|*.gil*|*.lib|*.bin.v2|*.exe|*.ilk|*.pdb)' ../diffable_boost_1_34_1/tools/build/v2/tools/msvc.jam ../boost_libraries/tools/build/v2/tools/msvc.jam --- ../diffable_boost_1_34_1/tools/build/v2/tools/msvc.jam 2007-05-10 10:05:12.000000000 -0700 +++ ../boost_libraries/tools/build/v2/tools/msvc.jam 2007-11-27 13:15:53.984375000 -0800 @@ -231,7 +231,11 @@ { # Even if version is not explicitly specified, try to detect the version # from the path. - if [ MATCH "(Microsoft Visual Studio 8)" : $(command) ] + if [ MATCH "(Microsoft Visual Studio 9.0)" : $(command) ] + { + version = 9.0 ; + } + else if [ MATCH "(Microsoft Visual Studio 8)" : $(command) ] { version = 8.0 ; } @@ -913,13 +917,14 @@ .ProgramFiles = [ path.make [ common.get-program-files-dir ] ] ; -.known-versions = 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ; +.known-versions = 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ; # Version aliases .version-alias-6 = 6.0 ; .version-alias-6.5 = 6.0 ; .version-alias-7 = 7.0 ; .version-alias-8 = 8.0 ; +.version-alias-9 = 9.0 ; # Name of the registry key that contains Visual C++ installation path # (relative to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft" @@ -928,6 +933,8 @@ .version-7.1-reg = "VisualStudio\\7.1\\Setup\\VC" ; .version-8.0-reg = "VisualStudio\\8.0\\Setup\\VC" ; .version-8.0express-reg = "VCExpress\\8.0\\Setup\\VC" ; +.version-9.0-reg = "VisualStudio\\9.0\\Setup\\VC" ; +.version-9.0express-reg = "VCExpress\\9.0\\Setup\\VC" ; # Visual C++ Toolkit 2003 do not store its installation path in the registry. # The environment variable 'VCToolkitInstallDir' and the default installation diff -wurx '(*wrong_line_ends_test.cpp|*.obj|*.o|*.gil*|*.lib|*.bin.v2|*.exe|*.ilk|*.pdb)' ../diffable_boost_1_34_1/tools/jam/src/build.bat ../boost_libraries/tools/jam/src/build.bat --- ../diffable_boost_1_34_1/tools/jam/src/build.bat 2007-01-11 13:50:48.000000000 -0800 +++ ../boost_libraries/tools/jam/src/build.bat 2007-09-25 16:04:49.156250000 -0700 @@ -1,6 +1,6 @@ @ECHO OFF -REM ~ Copyright 2002-2005 Rene Rivera. +REM ~ Copyright 2002-2007 Rene Rivera. REM ~ Distributed under the Boost Software License, Version 1.0. REM ~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) @@ -10,6 +10,7 @@ REM NOTE: The "setlocal & endlocal" construct is used to reset the errorlevel to 0. REM NOTE: The "set _error_=" construct is used to set the errorlevel to 1 + :Error_Print REM Output an error message and set the errorlevel to indicate failure. setlocal @@ -25,6 +26,7 @@ endlocal goto :eof + :Test_Path REM Tests for the given file(executable) presence in the directories in the PATH REM environment variable. Additionaly sets FOUND_PATH to the path of the @@ -36,6 +38,7 @@ if not errorlevel 1 set FOUND_PATH=%~dp$PATH:1 goto :eof + :Test_Option REM Tests wether the given string is in the form of an option: "-*" setlocal & endlocal @@ -49,6 +52,12 @@ endlocal goto :eof + +:Call_If_Exists +if EXIST %1 call %* +goto :eof + + :Guess_Toolset REM Try and guess the toolset to bootstrap the build with... REM Sets BOOST_JAM_TOOLSET to the first found toolset. @@ -63,7 +72,7 @@ set "BOOST_JAM_TOOLSET_ROOT=%VS80COMNTOOLS%..\..\VC\" goto :eof) setlocal & endlocal -if EXIST "%ProgramFiles%\Microsoft Visual Studio 8\VC\bin\VCVARS32.BAT" ( +if EXIST "%ProgramFiles%\Microsoft Visual Studio 8\VC\VCVARSALL.BAT" ( set "BOOST_JAM_TOOLSET=vc8" set "BOOST_JAM_TOOLSET_ROOT=%ProgramFiles%\Microsoft Visual Studio 8\VC\" goto :eof) @@ -152,6 +161,7 @@ call :Error_Print "Could not find a suitable toolset." goto :eof + :Guess_Yacc REM Tries to find bison or yacc in common places so we can build the grammar. setlocal & endlocal @@ -172,8 +182,10 @@ call :Error_Print "Could not find Yacc to build the Jam grammar." goto :eof + :Start set BOOST_JAM_TOOLSET= +set BOOST_JAM_ARGS= REM If no arguments guess the toolset; REM or if first argument is an option guess the toolset; @@ -195,6 +207,7 @@ ) if errorlevel 1 goto Finish + :Setup_Toolset REM Setup the toolset command and options. This bit of code REM needs to be flexible enough to handle both when @@ -204,28 +217,31 @@ REM because in BAT variables are subsituted only once during a single REM command. A complete "if ... ( commands ) else ( commands )" REM is a single command, even though it's in multiple lines here. -if "_%BOOST_JAM_TOOLSET%_" == "_metrowerks_" ( +:Setup_Args +if "_%1_" == "__" goto Config_Toolset +call :Test_Option "%1" +if errorlevel 1 ( + set BOOST_JAM_ARGS=%BOOST_JAM_ARGS% %1 + shift + goto Setup_Args +) +:Config_Toolset +if NOT "_%BOOST_JAM_TOOLSET%_" == "_metrowerks_" goto :Skip_METROWERKS if NOT "_%CWFolder%_" == "__" ( set "BOOST_JAM_TOOLSET_ROOT=%CWFolder%\" - ) ) -if "_%BOOST_JAM_TOOLSET%_" == "_metrowerks_" ( - if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( - set "PATH=%BOOST_JAM_TOOLSET_ROOT%Other Metrowerks Tools\Command Line Tools;%PATH%" ) +set "PATH=%BOOST_JAM_TOOLSET_ROOT%Other Metrowerks Tools\Command Line Tools;%PATH%" set "BOOST_JAM_CC=mwcc -runtime ss -cwd include -DNT -lkernel32.lib -ladvapi32.lib -luser32.lib" set "BOOST_JAM_OPT_JAM=-o bootstrap\jam0.exe" set "BOOST_JAM_OPT_MKJAMBASE=-o bootstrap\mkjambase0.exe" set "BOOST_JAM_OPT_YYACC=-o bootstrap\yyacc0.exe" set "_known_=1" -) -if "_%BOOST_JAM_TOOLSET%_" == "_msvc_" ( +:Skip_METROWERKS +if NOT "_%BOOST_JAM_TOOLSET%_" == "_msvc_" goto :Skip_MSVC if NOT "_%MSVCDir%_" == "__" ( set "BOOST_JAM_TOOLSET_ROOT=%MSVCDir%\" - ) ) -if "_%BOOST_JAM_TOOLSET%_" == "_msvc_" ( - if EXIST "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" ( - call "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" ) ) -if "_%BOOST_JAM_TOOLSET%_" == "_msvc_" ( + ) +call :Call_If_Exists "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( set "PATH=%BOOST_JAM_TOOLSET_ROOT%bin;%PATH%" ) @@ -234,88 +250,82 @@ set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" set "_known_=1" +:Skip_MSVC +if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc7_" goto :Skip_VC7 +if NOT "_%VS71COMNTOOLS%_" == "__" ( + set "BOOST_JAM_TOOLSET_ROOT=%VS71COMNTOOLS%..\..\VC7\" ) -if "_%BOOST_JAM_TOOLSET%_" == "_vc7_" ( - if NOT "_%MSVCDir%_" == "__" ( - set "BOOST_JAM_TOOLSET_ROOT=%MSVCDir%\" - ) ) -if "_%BOOST_JAM_TOOLSET%_" == "_vc7_" ( - if EXIST "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" ( - call "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" ) ) -if "_%BOOST_JAM_TOOLSET%_" == "_vc7_" ( - if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( +if "_%VCINSTALLDIR%_" == "__" call :Call_If_Exists "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" +if NOT "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( + if "_%VCINSTALLDIR%_" == "__" ( set "PATH=%BOOST_JAM_TOOLSET_ROOT%bin;%PATH%" - ) + ) ) set "BOOST_JAM_CC=cl /nologo /GZ /Zi /MLd -DNT -DYYDEBUG kernel32.lib advapi32.lib user32.lib" set "BOOST_JAM_OPT_JAM=/Febootstrap\jam0" set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" set "_known_=1" +:Skip_VC7 +if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc8_" goto :Skip_VC8 +if NOT "_%VS80COMNTOOLS%_" == "__" ( + set "BOOST_JAM_TOOLSET_ROOT=%VS80COMNTOOLS%..\..\VC\" ) -if "_%BOOST_JAM_TOOLSET%_" == "_vc8_" ( - if NOT "_%MSVCDir%_" == "__" ( - set "BOOST_JAM_TOOLSET_ROOT=%MSVCDir%\" - ) ) -if "_%BOOST_JAM_TOOLSET%_" == "_vc8_" ( - if EXIST "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" ( - call "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" ) ) -if "_%BOOST_JAM_TOOLSET%_" == "_vc8_" ( - if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( +if "_%VCINSTALLDIR%_" == "__" call :Call_If_Exists "%BOOST_JAM_TOOLSET_ROOT%VCVARSALL.BAT" %BOOST_JAM_ARGS% +if NOT "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( + if "_%VCINSTALLDIR%_" == "__" ( set "PATH=%BOOST_JAM_TOOLSET_ROOT%bin;%PATH%" - ) + ) ) set "BOOST_JAM_CC=cl /nologo /RTC1 /Zi /MTd -DNT -DYYDEBUG -wd4996 kernel32.lib advapi32.lib user32.lib" set "BOOST_JAM_OPT_JAM=/Febootstrap\jam0" set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" set "_known_=1" -) -if "_%BOOST_JAM_TOOLSET%_" == "_borland_" ( +:Skip_VC8 +if NOT "_%BOOST_JAM_TOOLSET%_" == "_borland_" goto :Skip_BORLAND if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( - call :Test_Path bcc32.exe ) ) -if "_%BOOST_JAM_TOOLSET%_" == "_borland_" ( + call :Test_Path bcc32.exe ) if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( if not errorlevel 1 ( set "BOOST_JAM_TOOLSET_ROOT=%FOUND_PATH%..\" - ) ) ) -if "_%BOOST_JAM_TOOLSET%_" == "_borland_" ( + ) ) if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( set "PATH=%BOOST_JAM_TOOLSET_ROOT%Bin;%PATH%" ) - set "BOOST_JAM_CC=bcc32 -WC -w- -q "-I%BOOST_JAM_TOOLSET_ROOT%Include" "-L%BOOST_JAM_TOOLSET_ROOT%Lib" /DNT -nbootstrap" +set "BOOST_JAM_CC=bcc32 -WC -w- -q -I%BOOST_JAM_TOOLSET_ROOT%Include -L%BOOST_JAM_TOOLSET_ROOT%Lib /DNT -nbootstrap" set "BOOST_JAM_OPT_JAM=-ejam0" set "BOOST_JAM_OPT_MKJAMBASE=-emkjambasejam0" set "BOOST_JAM_OPT_YYACC=-eyyacc0" set "_known_=1" -) -if "_%BOOST_JAM_TOOLSET%_" == "_como_" ( +:Skip_BORLAND +if NOT "_%BOOST_JAM_TOOLSET%_" == "_como_" goto :Skip_COMO set "BOOST_JAM_CC=como -DNT" set "BOOST_JAM_OPT_JAM=-o bootstrap\jam0.exe" set "BOOST_JAM_OPT_MKJAMBASE=-o bootstrap\mkjambase0.exe" set "BOOST_JAM_OPT_YYACC=-o bootstrap\yyacc0.exe" set "_known_=1" -) -if "_%BOOST_JAM_TOOLSET%_" == "_gcc_" ( +:Skip_COMO +if NOT "_%BOOST_JAM_TOOLSET%_" == "_gcc_" goto :Skip_GCC set "BOOST_JAM_CC=gcc -DNT" set "BOOST_JAM_OPT_JAM=-o bootstrap\jam0.exe" set "BOOST_JAM_OPT_MKJAMBASE=-o bootstrap\mkjambase0.exe" set "BOOST_JAM_OPT_YYACC=-o bootstrap\yyacc0.exe" set "_known_=1" -) -if "_%BOOST_JAM_TOOLSET%_" == "_gcc-nocygwin_" ( +:Skip_GCC +if NOT "_%BOOST_JAM_TOOLSET%_" == "_gcc-nocygwin_" goto :Skip_GCC_NOCYGWIN set "BOOST_JAM_CC=gcc -DNT -mno-cygwin" set "BOOST_JAM_OPT_JAM=-o bootstrap\jam0.exe" set "BOOST_JAM_OPT_MKJAMBASE=-o bootstrap\mkjambase0.exe" set "BOOST_JAM_OPT_YYACC=-o bootstrap\yyacc0.exe" set "_known_=1" -) -if "_%BOOST_JAM_TOOLSET%_" == "_intel-win32_" ( +:Skip_GCC_NOCYGWIN +if NOT "_%BOOST_JAM_TOOLSET%_" == "_intel-win32_" goto :Skip_INTEL_WIN32 set "BOOST_JAM_CC=icl -DNT /nologo kernel32.lib advapi32.lib user32.lib" set "BOOST_JAM_OPT_JAM=/Febootstrap\jam0" set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" set "_known_=1" -) -if "_%BOOST_JAM_TOOLSET%_" == "_mingw_" ( +:Skip_INTEL_WIN32 +if NOT "_%BOOST_JAM_TOOLSET%_" == "_mingw_" goto :Skip_MINGW if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( set "PATH=%BOOST_JAM_TOOLSET_ROOT%bin;%PATH%" ) @@ -324,7 +334,8 @@ set "BOOST_JAM_OPT_MKJAMBASE=-o bootstrap\mkjambase0.exe" set "BOOST_JAM_OPT_YYACC=-o bootstrap\yyacc0.exe" set "_known_=1" -) +:Skip_MINGW +setlocal & endlocal if "_%_known_%_" == "__" ( call :Error_Print "Unknown toolset: %BOOST_JAM_TOOLSET%" )