diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
| commit | 3feca961868cfd34893c07079214272a17f0bcb1 (patch) | |
| tree | c10d601cc292f9502b107a8748c4d3fbed018302 | |
| parent | 01a1ccf89482b29a5d0f9c04d1558464aa13ddc5 (diff) | |
| parent | 8adb1ff87a1a000e8b00be5bffb1680c604e0556 (diff) | |
merge commit
32 files changed, 1036 insertions, 3160 deletions
diff --git a/berkeleydb/db-4.7.25-mingw.patch b/berkeleydb/db-4.7.25-mingw.patch index cd1cf3a1d41d..38d83d156230 100644 --- a/berkeleydb/db-4.7.25-mingw.patch +++ b/berkeleydb/db-4.7.25-mingw.patch @@ -132,7 +132,171 @@ fi fi ;; -@@ -27697,6 +27697,18 @@ +@@ -22371,6 +22371,154 @@ + + + ++case "$host_os" in ++mingw*) ++for ac_header in execinfo.h sys/time.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## ---------------------------------------------------------- ## ++## Report this to Oracle Technology Network Berkeley DB forum ## ++## ---------------------------------------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++;; ++*) + for ac_header in execinfo.h sys/select.h sys/socket.h sys/time.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +@@ -22515,6 +22663,8 @@ + + done + ++;; ++esac + { echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 + echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; } + if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then +@@ -27697,6 +27847,18 @@ diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 313d8f63afd7..bc5df6964bc5 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -40,7 +40,7 @@ TARGET=so_berkeleydb .IF "$(SYSTEM_DB)" == "YES" all: - @echo "An already available installation of db should exist on your system." + @echo "An already available installation of db should exist on your system." @echo "Therefore the version provided here does not need to be built in addition." .ENDIF @@ -100,7 +100,9 @@ CONFIGURE_DIR=out CONFIGURE_ACTION= \ ..$/dist$/configure CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 - +.IF "$(OS)"=="MACOSX" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +.ENDIF # just pass ARCH_FLAGS to native build CFLAGS+:=$(ARCH_FLAGS) CXXFLAGS+:=$(ARCH_FLAGS) @@ -141,6 +143,7 @@ db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) db_LIBS=-lmingwthrd .IF "$(MINGW_SHARED_GXXLIB)"=="YES" +CFLAGS+=-D_GLIBCXX_DLL db_LIBS+=-lstdc++_s .ENDIF db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) @@ -148,7 +151,7 @@ db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) db_LIBXSO_LIBS+=-lgcc_s .ENDIF CONFIGURE_ACTION=..$/dist$/configure -CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" +CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) diff --git a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk b/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk index 5af2dc1f8c0f..a59850514022 100644 --- a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk +++ b/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk @@ -6,10 +6,6 @@ # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -40,8 +36,8 @@ TARGET=ttf_dejavu # --- Files -------------------------------------------------------- -TARFILE_NAME=dejavu-ttf-2.21 -TARFILE_ROOTDIR=dejavu-ttf-2.21 +TARFILE_NAME=dejavu-fonts-ttf-2.30 +TARFILE_ROOTDIR=dejavu-fonts-ttf-2.30 PATCH_FILES= diff --git a/boost/spirit/makefile.mk b/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk index e34465e4cd34..0bdbba04695d 100644 --- a/boost/spirit/makefile.mk +++ b/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk @@ -6,10 +6,6 @@ # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,40 +25,22 @@ # #************************************************************************* -# Hopefully we can move to a newer boost version soon, coming with spirit 1.8.*, -# so there won't be the need handle a separate spirit 1.6.* anymore. -# Depends on the compilers... :( - -# dmake create_clean -- just unpacks -# dmake patch -- unpacks and applies patch file -# dmake create_patch -- creates a patch file +PRJ=..$/.. -PRJ=.. - -PRJNAME=ooo_boost -TARGET=ooo_spirit +PRJNAME=bitstream_vera_fonts +TARGET=ttf_gentium # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -# force patched boost for sunpro CC -# to workaround opt bug when compiling with -xO3 -.IF "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC") -all: - @echo "An already available installation of boost should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." -.ELSE - # --- Files -------------------------------------------------------- -.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)">="000400000000" -all: - @echo "spirit is already included in boost 1.34" -.ELSE +TARFILE_NAME=gentiumbasic-fonts-1.10 +TARFILE_ROOTDIR=gentiumbasic-fonts-1.10 + +PATCH_FILES= -TARFILE_NAME=spirit-1.6.1 -PATCH_FILES=$(PRJ)$/$(TARFILE_NAME).patch CONFIGURE_DIR= CONFIGURE_ACTION= @@ -75,7 +53,8 @@ BUILD_FLAGS= .INCLUDE : set_ext.mk .INCLUDE : target.mk -.INCLUDE : tg_ext.mk +.IF "$(WITH_FONTS)"!="NO" +.INCLUDE : tg_ext.mk .ENDIF -.ENDIF + diff --git a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk b/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk index 112c8922f87a..6d8eb96d1e17 100644 --- a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk +++ b/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk @@ -6,10 +6,6 @@ # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,7 +25,7 @@ # #************************************************************************* -PRJ=../.. +PRJ=..$/.. PRJNAME=bitstream_vera_fonts TARGET=ttf_liberation @@ -40,8 +36,8 @@ TARGET=ttf_liberation # --- Files -------------------------------------------------------- -TARFILE_NAME=liberation-fonts-1.04 -TARFILE_ROOTDIR=liberation-fonts-1.04 +TARFILE_NAME=liberation-fonts-1.05 +TARFILE_ROOTDIR=liberation-fonts-1.05 PATCH_FILES= diff --git a/bitstream_vera_fonts/prj/build.lst b/bitstream_vera_fonts/prj/build.lst index 93449f04515c..27b9f8f5f81d 100644 --- a/bitstream_vera_fonts/prj/build.lst +++ b/bitstream_vera_fonts/prj/build.lst @@ -1,4 +1,5 @@ bs bitstream_vera_fonts : solenv NULL bs bitstream_vera_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL bs bitstream_vera_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL +bs bitstream_vera_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL diff --git a/bitstream_vera_fonts/prj/d.lst b/bitstream_vera_fonts/prj/d.lst index 00ee67cf0f50..831798dba3fb 100644 --- a/bitstream_vera_fonts/prj/d.lst +++ b/bitstream_vera_fonts/prj/d.lst @@ -1,7 +1,8 @@ mkdir: %COMMON_DEST%\pck%_EXT% -#..\%__SRC%\misc\build\ttf-bitstream-vera-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\dejavu-ttf-2.21\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\dejavu-ttf-2.21\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu -..\%__SRC%\misc\build\liberation-fonts-1.04\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\liberation-fonts-1.04\License %COMMON_DEST%\pck%_EXT%\LICENSE_liberation +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\dejavu-ttf-2.30\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu +..\%__SRC%\misc\build\liberation-fonts-1.05\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\liberation-fonts-1.05\License %COMMON_DEST%\pck%_EXT%\LICENSE_liberation +..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium diff --git a/boost/boost-1.30.2.patch b/boost/boost-1.30.2.patch deleted file mode 100644 index fe53de6ba274..000000000000 --- a/boost/boost-1.30.2.patch +++ /dev/null @@ -1,736 +0,0 @@ -*** misc/boost-1.30.2/boost/config/platform/macos.hpp Thu Feb 13 13:28:05 2003 ---- misc/build/boost-1.30.2/boost/config/platform/macos.hpp Mon Jun 4 10:01:49 2007 -*************** -*** 19,27 **** - # define BOOST_HAS_UNISTD_H - # endif - // boilerplate code: -! # ifndef TARGET_CARBON - # include <boost/config/posix_features.hpp> -! # endif - # ifndef BOOST_HAS_STDINT_H - # define BOOST_HAS_STDINT_H - # endif ---- 19,28 ---- - # define BOOST_HAS_UNISTD_H - # endif - // boilerplate code: -! // HDU: disabled the TARGET_CARBON check because of issue #i72248# -! //# ifndef TARGET_CARBON - # include <boost/config/posix_features.hpp> -! //# endif - # ifndef BOOST_HAS_STDINT_H - # define BOOST_HAS_STDINT_H - # endif -*** misc/boost-1.30.2/boost/bind.hpp Tue Oct 15 12:51:34 2002 ---- misc/build/boost-1.30.2/boost/bind.hpp Tue Jul 25 14:47:06 2006 -*************** -*** 5,10 **** ---- 5,17 ---- - #pragma once - #endif - -+ #if defined(_MSC_VER) && !defined(BOOST_MEM_FN_ENABLE_CDECL) -+ // enable support for __cdecl (SAL_CALL) C++-UNO interface methods; -+ // makes sense to shift this to command line some day: -+ // -DBOOST_MEM_FN_ENABLE_CDECL -+ #define BOOST_MEM_FN_ENABLE_CDECL -+ #endif -+ - // - // bind.hpp - binds function objects to arguments - // -*************** -*** 1472,1477 **** ---- 1479,1496 ---- - #undef BOOST_BIND_MF_NAME - #undef BOOST_BIND_MF_CC - -+ #ifdef BOOST_MEM_FN_ENABLE_CDECL -+ -+ #define BOOST_BIND_MF_NAME(X) X##_cdecl -+ #define BOOST_BIND_MF_CC __cdecl -+ -+ #include <boost/bind/bind_mf_cc.hpp> -+ -+ #undef BOOST_BIND_MF_NAME -+ #undef BOOST_BIND_MF_CC -+ -+ #endif -+ - #ifdef BOOST_MEM_FN_ENABLE_STDCALL - - #define BOOST_BIND_MF_NAME(X) X##_stdcall -*** misc/boost-1.30.2/boost/config/compiler/gcc.hpp 2003-08-02 18:20:49.000000000 +0200 ---- misc/build/boost-1.30.2/boost/config/compiler/gcc.hpp 2006-11-07 11:28:26.000000000 +0100 -*************** -*** 73,80 **** - # error "Compiler not configured - please reconfigure" - #endif - // -! // last known and checked version is 3.3: -! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else ---- 73,80 ---- - # error "Compiler not configured - please reconfigure" - #endif - // -! // last known and checked version is 4.2: -! #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 2)) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else -*** misc/boost-1.30.2/boost/function/function_template.hpp Fri Feb 7 15:03:36 2003 ---- misc/build/boost-1.30.2/boost/function/function_template.hpp Wed Mar 8 20:10:22 2006 -*************** -*** 15,20 **** ---- 15,23 ---- - - // Note: this header is a header template and must NOT have multiple-inclusion - // protection. -+ #if defined __GNUC__ -+ #pragma GCC system_header -+ #endif - #include <boost/function/detail/prologue.hpp> - - #define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T) -*************** -*** 395,401 **** - invoker = 0; - } - -! #if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG) - // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it - operator bool () const { return !this->empty(); } - #else ---- 398,404 ---- - invoker = 0; - } - -! #if (defined __SUNPRO_CC) // workaround opt bug when compiling with -xO3 - // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it - operator bool () const { return !this->empty(); } - #else -*************** -*** 443,451 **** - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type -! invoker_type; - -! invoker = &invoker_type::invoke; - function_base::manager = - &detail::function::functor_manager<FunctionPtr, Allocator>::manage; - function_base::functor = ---- 446,454 ---- - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type -! lcl_invoker_type; - -! invoker = &lcl_invoker_type::invoke; - function_base::manager = - &detail::function::functor_manager<FunctionPtr, Allocator>::manage; - function_base::functor = -*************** -*** 476,491 **** - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type -! invoker_type; - -! invoker = &invoker_type::invoke; - function_base::manager = &detail::function::functor_manager< - FunctionObj, Allocator>::manage; - #ifndef BOOST_NO_STD_ALLOCATOR - typedef typename Allocator::template rebind<FunctionObj>::other -! allocator_type; -! typedef typename allocator_type::pointer pointer_type; -! allocator_type allocator; - pointer_type copy = allocator.allocate(1); - allocator.construct(copy, f); - ---- 479,494 ---- - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type -! lcl_invoker_type; - -! invoker = &lcl_invoker_type::invoke; - function_base::manager = &detail::function::functor_manager< - FunctionObj, Allocator>::manage; - #ifndef BOOST_NO_STD_ALLOCATOR - typedef typename Allocator::template rebind<FunctionObj>::other -! lcl_allocator_type; -! typedef typename lcl_allocator_type::pointer pointer_type; -! lcl_allocator_type allocator; - pointer_type copy = allocator.allocate(1); - allocator.construct(copy, f); - -*************** -*** 510,518 **** - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type -! invoker_type; - -! invoker = &invoker_type::invoke; - function_base::manager = &detail::function::trivial_manager; - function_base::functor = - function_base::manager( ---- 513,521 ---- - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type -! lcl_invoker_type; - -! invoker = &lcl_invoker_type::invoke; - function_base::manager = &detail::function::trivial_manager; - function_base::functor = - function_base::manager( -*************** -*** 532,539 **** - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type -! invoker_type; -! invoker = &invoker_type::invoke; - function_base::manager = &detail::function::trivial_manager; - function_base::functor = detail::function::make_any_pointer(this); - } ---- 535,542 ---- - R BOOST_FUNCTION_COMMA - BOOST_FUNCTION_TEMPLATE_ARGS - >::type -! lcl_invoker_type; -! invoker = &lcl_invoker_type::invoke; - function_base::manager = &detail::function::trivial_manager; - function_base::functor = detail::function::make_any_pointer(this); - } -*** misc/boost-1.30.2/boost/function.hpp Fri Feb 14 16:34:39 2003 ---- misc/build/boost-1.30.2/boost/function.hpp Tue Jul 25 14:47:06 2006 -*************** -*** 16,21 **** ---- 16,26 ---- - // William Kempf, Jesse Jones and Karl Nelson were all very helpful in the - // design of this library. - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include <boost/preprocessor/iterate.hpp> - #include <boost/detail/workaround.hpp> - -*************** -*** 67,70 **** ---- 72,79 ---- - # define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_FUNCTION_MAX_ARGS,<boost/function/detail/function_iterate.hpp>)) - # include BOOST_PP_ITERATE() - # undef BOOST_PP_ITERATION_PARAMS_1 -+ #endif -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) - #endif -*** misc/boost-1.30.2/boost/mem_fn.hpp Fri Dec 20 19:14:59 2002 ---- misc/build/boost-1.30.2/boost/mem_fn.hpp Tue Jul 25 14:47:06 2006 -*************** -*** 5,10 **** ---- 5,17 ---- - #pragma once - #endif - -+ #if defined(_MSC_VER) && !defined(BOOST_MEM_FN_ENABLE_CDECL) -+ // enable support for __cdecl (SAL_CALL) C++-UNO interface methods; -+ // makes sense to shift this to command line some day: -+ // -DBOOST_MEM_FN_ENABLE_CDECL -+ #define BOOST_MEM_FN_ENABLE_CDECL -+ #endif -+ - // - // mem_fn.hpp - a generalization of std::mem_fun[_ref] - // -*************** -*** 46,51 **** ---- 53,70 ---- - #undef BOOST_MEM_FN_CC - #undef BOOST_MEM_FN_NAME - -+ #ifdef BOOST_MEM_FN_ENABLE_CDECL -+ -+ #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl -+ #define BOOST_MEM_FN_CC __cdecl -+ -+ #include <boost/bind/mem_fn_template.hpp> -+ -+ #undef BOOST_MEM_FN_CC -+ #undef BOOST_MEM_FN_NAME -+ -+ #endif -+ - #ifdef BOOST_MEM_FN_ENABLE_STDCALL - - #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall -*************** -*** 87,92 **** ---- 106,123 ---- - #undef BOOST_MEM_FN_CC - #undef BOOST_MEM_FN_NAME - -+ #ifdef BOOST_MEM_FN_ENABLE_CDECL -+ -+ #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl -+ #define BOOST_MEM_FN_CC __cdecl -+ -+ #include <boost/bind/mem_fn_template.hpp> -+ -+ #undef BOOST_MEM_FN_CC -+ #undef BOOST_MEM_FN_NAME -+ -+ #endif -+ - #ifdef BOOST_MEM_FN_ENABLE_STDCALL - - #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall -*************** -*** 128,133 **** ---- 159,178 ---- - #undef BOOST_MEM_FN_NAME2 - #undef BOOST_MEM_FN_CC - -+ #ifdef BOOST_MEM_FN_ENABLE_CDECL -+ -+ #define BOOST_MEM_FN_NAME(X) X##_cdecl -+ #define BOOST_MEM_FN_NAME2(X) inner_##X##_cdecl -+ #define BOOST_MEM_FN_CC __cdecl -+ -+ #include <boost/bind/mem_fn_vw.hpp> -+ -+ #undef BOOST_MEM_FN_NAME -+ #undef BOOST_MEM_FN_NAME2 -+ #undef BOOST_MEM_FN_CC -+ -+ #endif -+ - #ifdef BOOST_MEM_FN_ENABLE_STDCALL - - #define BOOST_MEM_FN_NAME(X) X##_stdcall -*************** -*** 176,181 **** ---- 221,238 ---- - #undef BOOST_MEM_FN_CC - #undef BOOST_MEM_FN_NAME - -+ #ifdef BOOST_MEM_FN_ENABLE_CDECL -+ -+ #define BOOST_MEM_FN_NAME(X) X##_cdecl -+ #define BOOST_MEM_FN_CC __cdecl -+ -+ #include <boost/bind/mem_fn_template.hpp> -+ -+ #undef BOOST_MEM_FN_CC -+ #undef BOOST_MEM_FN_NAME -+ -+ #endif -+ - #ifdef BOOST_MEM_FN_ENABLE_STDCALL - - #define BOOST_MEM_FN_NAME(X) X##_stdcall -*************** -*** 217,222 **** ---- 274,291 ---- - #undef BOOST_MEM_FN_NAME - #undef BOOST_MEM_FN_CC - -+ #ifdef BOOST_MEM_FN_ENABLE_CDECL -+ -+ #define BOOST_MEM_FN_NAME(X) X##_cdecl -+ #define BOOST_MEM_FN_CC __cdecl -+ -+ #include <boost/bind/mem_fn_cc.hpp> -+ -+ #undef BOOST_MEM_FN_NAME -+ #undef BOOST_MEM_FN_CC -+ -+ #endif -+ - #ifdef BOOST_MEM_FN_ENABLE_STDCALL - - #define BOOST_MEM_FN_NAME(X) X##_stdcall -*** misc/build/boost-1.30.2/boost/function/function_base.hpp Fri Jul 18 06:04:54 2003 ---- misc/modified/boost-1.30.2/boost/function/function_base.hpp Thu Aug 10 11:17:30 2006 -*************** -*** 16,21 **** ---- 16,26 ---- - #ifndef BOOST_FUNCTION_BASE_HEADER - #define BOOST_FUNCTION_BASE_HEADER - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include <stdexcept> - #include <string> - #include <memory> -*************** -*** 413,416 **** ---- 418,425 ---- - } // end namespace detail - } // end namespace boost - -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -+ - #endif // BOOST_FUNCTION_BASE_HEADER -*** misc/build/boost-1.30.2/boost/iterator_adaptors.hpp Fri Dec 27 17:51:52 2002 ---- misc/modified/boost-1.30.2/boost/iterator_adaptors.hpp Thu Aug 10 11:33:04 2006 -*************** -*** 119,124 **** ---- 119,129 ---- - #ifndef BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_ - # define BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_ - -+ # if defined _MSC_VER -+ # pragma warning(push) -+ # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ # endif -+ - # include <boost/iterator.hpp> - # include <boost/utility.hpp> - # include <boost/compressed_pair.hpp> -*************** -*** 873,879 **** - return policies().dereference(*this); - } - -! #if BOOST_WORKAROUND(BOOST_MSVC, > 0) - # pragma warning(push) - # pragma warning( disable : 4284 ) - #endif ---- 878,884 ---- - return policies().dereference(*this); - } - -! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - # pragma warning(push) - # pragma warning( disable : 4284 ) - #endif -*************** -*** 882,888 **** - operator->() const - { return detail::operator_arrow(*this, iterator_category()); } - -! #if BOOST_WORKAROUND(BOOST_MSVC, > 0) - # pragma warning(pop) - #endif - ---- 887,893 ---- - operator->() const - { return detail::operator_arrow(*this, iterator_category()); } - -! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - # pragma warning(pop) - #endif - -*************** -*** 1430,1435 **** ---- 1435,1443 ---- - } // namespace boost - # undef BOOST_ARG_DEPENDENT_TYPENAME - -+ # if defined _MSC_VER -+ # pragma warning(pop) -+ # endif - - #endif - -*** misc/build/boost-1.30.2/boost/mpl/aux_/ice_cast.hpp Tue Feb 4 21:21:05 2003 ---- misc/modified/boost-1.30.2/boost/mpl/aux_/ice_cast.hpp Thu Aug 10 11:17:20 2006 -*************** -*** 17,22 **** ---- 17,27 ---- - #ifndef BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED - #define BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/config/workaround.hpp" - - #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \ -*************** -*** 28,31 **** ---- 33,40 ---- - # define BOOST_MPL_AUX_ICE_CAST(T, expr) static_cast<T>(expr) - #endif - -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -+ - #endif // BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED -*** misc/build/boost-1.30.2/boost/mpl/aux_/integral_wrapper.hpp Thu Mar 13 13:13:32 2003 ---- misc/modified/boost-1.30.2/boost/mpl/aux_/integral_wrapper.hpp Thu Aug 10 11:17:06 2006 -*************** -*** 17,22 **** ---- 17,27 ---- - - // no include guards, the header is intended for multiple inclusion! - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/ice_cast.hpp" - #include "boost/mpl/aux_/config/nttp.hpp" - #include "boost/mpl/aux_/config/static_constant.hpp" -*************** -*** 84,86 **** ---- 89,95 ---- - #undef AUX_WRAPPER_PARAMS - #undef AUX_WRAPPER_INST - #undef AUX_WRAPPER_VALUE_TYPE -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -*** misc/build/boost-1.30.2/boost/mpl/aux_/lambda_support.hpp Sat Mar 8 08:10:07 2003 ---- misc/modified/boost-1.30.2/boost/mpl/aux_/lambda_support.hpp Thu Aug 10 11:16:54 2006 -*************** -*** 17,22 **** ---- 17,27 ---- - #ifndef BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED - #define BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/config/lambda.hpp" - - #if !defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT) -*************** -*** 133,136 **** ---- 138,145 ---- - - #endif // BOOST_MPL_NO_FULL_LAMBDA_SUPPORT - -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -+ - #endif // BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED -*** misc/build/boost-1.30.2/boost/mpl/aux_/logical_op.hpp Wed Feb 26 00:10:54 2003 ---- misc/modified/boost-1.30.2/boost/mpl/aux_/logical_op.hpp Thu Aug 10 11:16:40 2006 -*************** -*** 17,22 **** ---- 17,27 ---- - - // no include guards, the header is intended for multiple inclusion! - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #if !defined(BOOST_MPL_PREPROCESSING_MODE) - # include "boost/mpl/bool.hpp" - # include "boost/mpl/aux_/nested_type_wknd.hpp" -*************** -*** 167,169 **** ---- 172,178 ---- - #undef AUX_LOGICAL_OP_NAME - #undef AUX_LOGICAL_OP_VALUE1 - #undef AUX_LOGICAL_OP_VALUE2 -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -*** misc/build/boost-1.30.2/boost/mpl/if.hpp Thu Mar 13 13:13:29 2003 ---- misc/modified/boost-1.30.2/boost/mpl/if.hpp Thu Aug 10 11:16:06 2006 -*************** -*** 17,22 **** ---- 17,27 ---- - // - // See http://www.boost.org/libs/mpl for documentation. - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/value_wknd.hpp" - #include "boost/mpl/aux_/ice_cast.hpp" - #include "boost/mpl/aux_/void_spec.hpp" -*************** -*** 174,177 **** ---- 179,186 ---- - } // namespace mpl - } // namespace boost - -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -+ - #endif // BOOST_MPL_IF_HPP_INCLUDED -*** misc/build/boost-1.30.2/boost/mpl/integral_c.hpp Thu Mar 13 13:13:29 2003 ---- misc/modified/boost-1.30.2/boost/mpl/integral_c.hpp Thu Aug 10 11:15:52 2006 -*************** -*** 18,23 **** ---- 18,28 ---- - // - // See http://www.boost.org/libs/mpl for documentation. - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/integral_c_fwd.hpp" - #include "boost/mpl/aux_/ice_cast.hpp" - #include "boost/mpl/aux_/config/ctps.hpp" -*************** -*** 50,53 **** ---- 55,62 ---- - }} - #endif - -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -+ - #endif // BOOST_MPL_INTEGRAL_C_HPP_INCLUDED -*** misc/build/boost-1.30.2/boost/mpl/integral_c_fwd.hpp Thu Mar 13 13:13:30 2003 ---- misc/modified/boost-1.30.2/boost/mpl/integral_c_fwd.hpp Thu Aug 10 11:15:36 2006 -*************** -*** 18,23 **** ---- 18,28 ---- - // - // See http://www.boost.org/libs/mpl for documentation. - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/config/workaround.hpp" - - namespace boost { namespace mpl { -*************** -*** 29,32 **** ---- 34,41 ---- - #endif - }} - -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -+ - #endif // BOOST_MPL_INTEGRAL_C_FWD_HPP_INCLUDED -*** misc/build/boost-1.30.2/boost/mpl/is_sequence.hpp Wed Feb 26 00:10:43 2003 ---- misc/modified/boost-1.30.2/boost/mpl/is_sequence.hpp Thu Aug 10 11:15:14 2006 -*************** -*** 17,22 **** ---- 17,27 ---- - #ifndef BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED - #define BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/not.hpp" - #include "boost/mpl/or.hpp" - #include "boost/mpl/begin_end.hpp" -*************** -*** 98,101 **** ---- 103,110 ---- - - }} // namespace boost::mpl - -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -+ - #endif // BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED -*** misc/build/boost-1.30.2/boost/mpl/sequence_tag.hpp Mon Feb 24 01:50:53 2003 ---- misc/modified/boost-1.30.2/boost/mpl/sequence_tag.hpp Thu Aug 10 11:14:58 2006 -*************** -*** 17,22 **** ---- 17,27 ---- - #ifndef BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED - #define BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/sequence_tag_fwd.hpp" - #include "boost/mpl/aux_/has_tag.hpp" - #include "boost/mpl/aux_/has_begin.hpp" -*************** -*** 130,133 **** ---- 135,142 ---- - - }} // namespace boost::mpl - -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -+ - #endif // BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED - -*** misc/build/boost-1.30.2/boost/token_functions.hpp 2007-05-20 07:38:11.000000000 -0400 ---- misc/modified/boost-1.30.2/boost/token_functions.hpp 2007-05-20 08:05:05.000000000 -0400 -*************** -*** 64,70 **** - // character (backslash \), can be assigned to other characters. - - struct escaped_list_error : public std::runtime_error{ -! escaped_list_error(const std::string& what):std::runtime_error(what) { } - }; - - ---- 64,70 ---- - // character (backslash \), can be assigned to other characters. - - struct escaped_list_error : public std::runtime_error{ -! escaped_list_error(const std::string& s_what) : std::runtime_error(s_what) { } - }; - - -*** misc/build/boost-1.30.2/boost/token_iterator.hpp 2007-05-20 07:38:10.000000000 -0400 ---- misc/modified/boost-1.30.2/boost/token_iterator.hpp 2007-05-20 08:10:20.000000000 -0400 -*************** -*** 64,72 **** - - template<class Iterator> - typename Iterator::reference -! dereference(const Iterator& a) const{ - using namespace std; -! assert(a.base().valid_); - return tok_; - } - template <class Iterator> ---- 64,72 ---- - - template<class Iterator> - typename Iterator::reference -! dereference(const Iterator& iter ) const{ - using namespace std; -! (void)iter; assert(iter.base().valid_); - return tok_; - } - template <class Iterator> diff --git a/boost/boost_1_34_1.patch b/boost/boost_1_34_1.patch deleted file mode 100644 index 6f0c79abff1e..000000000000 --- a/boost/boost_1_34_1.patch +++ /dev/null @@ -1,260 +0,0 @@ ---- misc/boost_1_34_1/boost/config/compiler/visualc.hpp 2006-01-13 10:48:08.000000000 +0000 -+++ misc/build/boost_1_34_1/boost/config/compiler/visualc.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -108,6 +108,9 @@ - # define BOOST_DISABLE_WIN32 - #endif - -+// disable WORKAROUND macro - gives warning for undefined macros -+#define BOOST_STRICT_CONFIG -+ - // - // all versions support __declspec: - // ---- misc/boost_1_34_1/boost/mpl/apply.hpp 2004-09-02 16:40:41.000000000 +0100 -+++ misc/build/boost_1_34_1/boost/mpl/apply.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -135,7 +135,8 @@ - - ///// iteration, depth == 1 - --#elif BOOST_PP_ITERATION_DEPTH() == 1 -+#else -+#if BOOST_PP_ITERATION_DEPTH() == 1 - - # define i_ BOOST_PP_FRAME_ITERATION(1) - -@@ -222,4 +223,5 @@ - - # undef i_ - -+#endif - #endif // BOOST_PP_IS_ITERATING ---- misc/boost_1_34_1/boost/mpl/apply_wrap.hpp 2004-09-03 16:56:55.000000000 +0100 -+++ misc/build/boost_1_34_1/boost/mpl/apply_wrap.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -78,7 +78,8 @@ - - ///// iteration, depth == 1 - --#elif BOOST_PP_ITERATION_DEPTH() == 1 -+#else -+#if BOOST_PP_ITERATION_DEPTH() == 1 - - # define i_ BOOST_PP_FRAME_ITERATION(1) - -@@ -169,8 +170,8 @@ - # undef i_ - - ///// iteration, depth == 2 -- --#elif BOOST_PP_ITERATION_DEPTH() == 2 -+#else -+#if BOOST_PP_ITERATION_DEPTH() == 2 - - # define j_ BOOST_PP_FRAME_ITERATION(2) - -@@ -197,4 +198,6 @@ - - # undef j_ - -+#endif -+#endif - #endif // BOOST_PP_IS_ITERATING ---- misc/boost_1_34_1/boost/mpl/aux_/full_lambda.hpp 2004-09-04 02:10:19.000000000 +0100 -+++ misc/build/boost_1_34_1/boost/mpl/aux_/full_lambda.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -227,7 +227,8 @@ - - ///// iteration, depth == 1 - --#elif BOOST_PP_ITERATION_DEPTH() == 1 -+#else -+#if BOOST_PP_ITERATION_DEPTH() == 1 - #define i_ BOOST_PP_FRAME_ITERATION(1) - - #if i_ > 0 -@@ -347,4 +348,5 @@ - }; - - #undef i_ -+#endif - #endif // BOOST_PP_IS_ITERATING ---- misc/boost_1_34_1/boost/mpl/aux_/numeric_op.hpp 2005-08-25 17:27:21.000000000 +0100 -+++ misc/build/boost_1_34_1/boost/mpl/aux_/numeric_op.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -287,7 +287,8 @@ - - ///// iteration, depth == 1 - --#elif BOOST_PP_ITERATION_DEPTH() == 1 -+#else -+#if BOOST_PP_ITERATION_DEPTH() == 1 - - # define i_ BOOST_PP_FRAME_ITERATION(1) - -@@ -308,4 +309,5 @@ - - # undef i_ - -+#endif - #endif // BOOST_PP_IS_ITERATING ---- misc/boost_1_34_1/boost/mpl/bind.hpp 2004-10-26 15:51:04.000000000 +0100 -+++ misc/build/boost_1_34_1/boost/mpl/bind.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -361,7 +361,8 @@ - - ///// iteration, depth == 1 - --#elif BOOST_PP_ITERATION_DEPTH() == 1 -+#else -+#if BOOST_PP_ITERATION_DEPTH() == 1 - - # define i_ BOOST_PP_FRAME_ITERATION(1) - -@@ -528,7 +529,8 @@ - - ///// iteration, depth == 2 - --#elif BOOST_PP_ITERATION_DEPTH() == 2 -+#else -+#if BOOST_PP_ITERATION_DEPTH() == 2 - - # define j_ BOOST_PP_FRAME_ITERATION(2) - # if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT) -@@ -544,4 +546,6 @@ - # endif - # undef j_ - -+#endif -+#endif - #endif // BOOST_PP_IS_ITERATING ---- misc/boost_1_34_1/boost/spirit/core/impl/match.ipp 2004-07-14 15:24:02.000000000 +0100 -+++ misc/build/boost_1_34_1/boost/spirit/core/impl/match.ipp 2008-12-03 13:54:01.000000000 +0000 -@@ -17,12 +17,12 @@ - : len(-1), val() {} - - template <typename T> -- inline match<T>::match(std::size_t length) -- : len(length), val() {} -+ inline match<T>::match(std::size_t _length) -+ : len(_length), val() {} - - template <typename T> -- inline match<T>::match(std::size_t length, ctor_param_t val_) -- : len(length), val(val_) {} -+ inline match<T>::match(std::size_t _length, ctor_param_t val_) -+ : len(_length), val(val_) {} - - template <typename T> - inline bool -@@ -64,11 +64,11 @@ - inline match<nil_t>::match() - : len(-1) {} - -- inline match<nil_t>::match(std::size_t length) -- : len(length) {} -+ inline match<nil_t>::match(std::size_t _length) -+ : len(_length) {} - -- inline match<nil_t>::match(std::size_t length, nil_t) -- : len(length) {} -+ inline match<nil_t>::match(std::size_t _length, nil_t) -+ : len(_length) {} - - inline bool - match<nil_t>::operator!() const ---- misc/boost_1_34_1/boost/spirit/core/non_terminal/impl/rule.ipp 2004-07-09 09:28:02.000000000 +0100 -+++ misc/build/boost_1_34_1/boost/spirit/core/non_terminal/impl/rule.ipp 2008-12-03 13:54:01.000000000 +0000 -@@ -224,7 +224,7 @@ - template <typename ParserT, typename ScannerT, typename AttrT> - struct concrete_parser : abstract_parser<ScannerT, AttrT> - { -- concrete_parser(ParserT const& p) : p(p) {} -+ concrete_parser(ParserT const& _p) : p(_p) {} - virtual ~concrete_parser() {} - - virtual typename match_result<ScannerT, AttrT>::type ---- misc/boost_1_34_1/boost/spirit/core/non_terminal/parser_id.hpp 2005-01-17 01:01:52.000000000 +0000 -+++ misc/build/boost_1_34_1/boost/spirit/core/non_terminal/parser_id.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -104,7 +104,7 @@ - : parser_id(reinterpret_cast<std::size_t>(this)); - } - -- void set_id(parser_id id) { tag = id; } -+ void set_id(parser_id _id) { tag = _id; } - - private: - ---- misc/boost_1_34_1/boost/spirit/core/non_terminal/rule.hpp 2004-07-09 09:28:01.000000000 +0100 -+++ misc/build/boost_1_34_1/boost/spirit/core/non_terminal/rule.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -157,8 +157,8 @@ - return ptr.get(); - } - -- rule(abstract_parser_t const* ptr) -- : ptr(ptr) {} -+ rule(abstract_parser_t const* _ptr) -+ : ptr(_ptr) {} - - scoped_ptr<abstract_parser_t> ptr; - }; ---- misc/boost_1_34_1/boost/spirit/core/non_terminal/subrule.hpp 2006-02-08 23:05:38.000000000 +0000 -+++ misc/build/boost_1_34_1/boost/spirit/core/non_terminal/subrule.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -208,7 +208,7 @@ - subrule_list< - subrule_parser<ID2, DefT2, ContextT2>, - nil_t> > -- operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const -+ operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const - { - return subrule_list< - self_t, -@@ -218,7 +218,7 @@ - *this, - subrule_list< - subrule_parser<ID2, DefT2, ContextT2>, nil_t>( -- rhs, nil_t())); -+ _rhs, nil_t())); - } - - typename DefT::embed_t rhs; -@@ -256,10 +256,10 @@ - parse_main(ScannerT const& scan) const - { - typedef typename parser_result<self_t, ScannerT>::type result_t; -- result_t result; -+ result_t _result; - impl::parse_subrule<result_t, ScannerT, ID>:: -- do_(result, scan); -- return result; -+ do_(_result, scan); -+ return _result; - } - - template <typename ScannerT> ---- misc/boost_1_34_1/boost/spirit/core/scanner/scanner.hpp 2006-02-08 23:05:39.000000000 +0000 -+++ misc/build/boost_1_34_1/boost/spirit/core/scanner/scanner.hpp 2008-12-03 13:54:01.000000000 +0000 -@@ -242,22 +242,22 @@ - bool - at_end() const - { -- typedef typename PoliciesT::iteration_policy_t iteration_policy_t; -- return iteration_policy_t::at_end(*this); -+ typedef typename PoliciesT::iteration_policy_t _iteration_policy_t; -+ return _iteration_policy_t::at_end(*this); - } - - value_t - operator*() const - { -- typedef typename PoliciesT::iteration_policy_t iteration_policy_t; -- return iteration_policy_t::filter(iteration_policy_t::get(*this)); -+ typedef typename PoliciesT::iteration_policy_t _iteration_policy_t; -+ return _iteration_policy_t::filter(_iteration_policy_t::get(*this)); - } - - scanner const& - operator++() const - { -- typedef typename PoliciesT::iteration_policy_t iteration_policy_t; -- iteration_policy_t::advance(*this); -+ typedef typename PoliciesT::iteration_policy_t _iteration_policy_t; -+ _iteration_policy_t::advance(*this); - return *this; - } - diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch new file mode 100644 index 000000000000..d2ad9fc7db9f --- /dev/null +++ b/boost/boost_1_39_0.patch @@ -0,0 +1,183 @@ +--- misc/boost_1_39_0/boost/function/function_template.hpp 2008-10-16 15:21:50.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/function/function_template.hpp 2009-07-09 12:58:51.141224220 +0200 +@@ -950,10 +950,10 @@ + f.vtable->manager(f.functor, this->functor, + boost::detail::function::move_functor_tag); + f.vtable = 0; +-#if !defined(BOOST_NO_EXCEPTIONS) + } else { + clear(); + } ++#if !defined(BOOST_NO_EXCEPTIONS) + } catch (...) { + vtable = 0; + throw; +--- misc/boost_1_39_0/boost/function/function_base.hpp 2008-10-16 15:21:50.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/function/function_base.hpp 2009-07-12 21:42:22.779873909 +0200 +@@ -42,7 +42,7 @@ + #endif + + // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info. +-#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE ++#ifdef BOOST_NO_STD_TYPEINFO + // Embedded VC++ does not have type_info in namespace std + # define BOOST_FUNCTION_STD_NS + #else +--- misc/boost_1_39_0/boost/config/compiler/visualc.hpp 2009-03-26 20:00:00.000000000 +0100 ++++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp 2009-06-10 21:53:42.484375000 +0200 +@@ -138,6 +138,9 @@ + # define BOOST_NO_RTTI + #endif + ++// disable WORKAROUND macro - gives warning for undefined macros ++#define BOOST_STRICT_CONFIG 1 ++ + // + // all versions support __declspec: + // +--- misc/boost_1_39_0/boost/mpl/apply_wrap.hpp 2008-10-11 08:50:46.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp 2009-06-10 21:53:42.500000000 +0200 +@@ -173,8 +173,8 @@ + # undef i_ + + ///// iteration, depth == 2 +- +-#elif BOOST_PP_ITERATION_DEPTH() == 2 ++#else ++#if BOOST_PP_ITERATION_DEPTH() == 2 + + # define j_ BOOST_PP_FRAME_ITERATION(2) + +@@ -230,4 +231,5 @@ + # undef j_ + + #endif // BOOST_PP_ITERATION_DEPTH() ++#endif + #endif // BOOST_PP_IS_ITERATING +--- misc/boost_1_39_0/boost/mpl/bind.hpp 2008-10-11 08:19:02.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/mpl/bind.hpp 2009-06-10 21:53:42.515625000 +0200 +@@ -531,7 +531,8 @@ + + ///// iteration, depth == 2 + +-#elif BOOST_PP_ITERATION_DEPTH() == 2 ++#else ++#if BOOST_PP_ITERATION_DEPTH() == 2 + + # define j_ BOOST_PP_FRAME_ITERATION(2) + # if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT) +@@ -548,4 +549,5 @@ + # undef j_ + + #endif // BOOST_PP_ITERATION_DEPTH() ++#endif + #endif // BOOST_PP_IS_ITERATING +--- misc/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp 2009-06-10 21:53:42.531250000 +0200 +@@ -19,12 +19,12 @@ + : len(-1), val() {} + + template <typename T> +- inline match<T>::match(std::size_t length) +- : len(length), val() {} ++ inline match<T>::match(std::size_t _length) ++ : len(_length), val() {} + + template <typename T> +- inline match<T>::match(std::size_t length, ctor_param_t val_) +- : len(length), val(val_) {} ++ inline match<T>::match(std::size_t _length, ctor_param_t val_) ++ : len(_length), val(val_) {} + + template <typename T> + inline bool +@@ -66,11 +66,11 @@ + inline match<nil_t>::match() + : len(-1) {} + +- inline match<nil_t>::match(std::size_t length) +- : len(length) {} ++ inline match<nil_t>::match(std::size_t _length) ++ : len(_length) {} + +- inline match<nil_t>::match(std::size_t length, nil_t) +- : len(length) {} ++ inline match<nil_t>::match(std::size_t _length, nil_t) ++ : len(_length) {} + + inline bool + match<nil_t>::operator!() const +--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2009-06-10 21:53:42.546875000 +0200 +@@ -226,7 +226,7 @@ + template <typename ParserT, typename ScannerT, typename AttrT> + struct concrete_parser : abstract_parser<ScannerT, AttrT> + { +- concrete_parser(ParserT const& p) : p(p) {} ++ concrete_parser(ParserT const& _p) : p(_p) {} + virtual ~concrete_parser() {} + + virtual typename match_result<ScannerT, AttrT>::type +--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2009-06-10 21:53:42.562500000 +0200 +@@ -106,7 +106,7 @@ + : parser_id(reinterpret_cast<std::size_t>(this)); + } + +- void set_id(parser_id id) { tag = id; } ++ void set_id(parser_id _id) { tag = _id; } + + private: + +--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp 2009-07-08 22:23:45.899895415 +0200 +@@ -159,11 +159,11 @@ + return ptr.get(); + } + +- rule(abstract_parser_t* ptr) +- : ptr(ptr) {} ++ rule(abstract_parser_t* _ptr) ++ : ptr(_ptr) {} + +- rule(abstract_parser_t const* ptr) +- : ptr(ptr) {} ++ rule(abstract_parser_t const* _ptr) ++ : ptr(_ptr) {} + + scoped_ptr<abstract_parser_t> ptr; + }; +--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2009-06-10 21:53:42.593750000 +0200 +@@ -210,7 +210,7 @@ + subrule_list< + subrule_parser<ID2, DefT2, ContextT2>, + nil_t> > +- operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const ++ operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const + { + return subrule_list< + self_t, +@@ -220,7 +220,7 @@ + *this, + subrule_list< + subrule_parser<ID2, DefT2, ContextT2>, nil_t>( +- rhs, nil_t())); ++ _rhs, nil_t())); + } + + typename DefT::embed_t rhs; +@@ -258,10 +258,10 @@ + parse_main(ScannerT const& scan) const + { + typedef typename parser_result<self_t, ScannerT>::type result_t; +- result_t result; ++ result_t _result; + impl::parse_subrule<result_t, ScannerT, ID>:: +- do_(result, scan); +- return result; ++ do_(_result, scan); ++ return _result; + } + + template <typename ScannerT> diff --git a/boost/makefile.mk b/boost/makefile.mk index 7f5e5b4c5441..e58e8939a09e 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -35,7 +35,7 @@ PRJ=. -PRJNAME=ooo_boost +PRJNAME=boost TARGET=ooo_boost # --- Settings ----------------------------------------------------- @@ -52,19 +52,9 @@ all: # --- Files -------------------------------------------------------- -TARFILE_NAME=boost-1.30.2 +TARFILE_NAME=boost_1_39_0 PATCH_FILES=$(TARFILE_NAME).patch -.IF "$(COMID)"=="gcc3" - -# enabled for gcc4.x -.IF "$(CCNUMVER)">="000400000000" - TARFILE_NAME=boost_1_34_1 - PATCH_FILES=$(TARFILE_NAME).patch -.ENDIF - -.ENDIF - CONFIGURE_DIR= CONFIGURE_ACTION= @@ -78,4 +68,41 @@ BUILD_FLAGS= .INCLUDE : target.mk .INCLUDE : tg_ext.mk +# --- post-build --------------------------------------------------- + +# "normalize" the output structure, in that the C++ headers are +# copied to the canonic location in OUTPATH +# The allows, later on, to use the standard mechanisms to deliver those +# files, instead of delivering them out of OUTPATH/misc/build/..., which +# could cause problems + +NORMALIZE_FLAG_FILE=so_normalized_$(TARGET) + +$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) + -@$(MKDIRHIER) $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/preprocessor $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/type_traits $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/utility $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/variant $(INCCOM)$/$(PRJNAME) + @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) + +normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) + +$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize .ENDIF # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC") diff --git a/boost/prj/build.lst b/boost/prj/build.lst index 50762576e06d..421265b927f7 100644 --- a/boost/prj/build.lst +++ b/boost/prj/build.lst @@ -1,4 +1,3 @@ bo boost : SO:so_prereq solenv NULL bo boost usr1 - all bo_mkout NULL bo boost nmake - all bo_boost NULL -bo boost\spirit nmake - all bo_spirit NULL diff --git a/boost/prj/d.lst b/boost/prj/d.lst index 8c17a2800a4b..1db88f339a85 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -1,390 +1,300 @@ mkdir: %_DEST%\inc%_EXT%\boost - -..\%__SRC%\misc\build\boost-1.30.2\boost\rational.hpp %_DEST%\inc%_EXT%\boost\rational.hpp -..\%__SRC%\misc\build\boost-1.30.2\boost\operators.hpp %_DEST%\inc%_EXT%\boost\operators.hpp -..\%__SRC%\misc\build\boost-1.30.2\boost\tokenizer.hpp %_DEST%\inc%_EXT%\boost\tokenizer.hpp -..\%__SRC%\misc\build\boost-1.30.2\boost\token_iterator.hpp %_DEST%\inc%_EXT%\boost\token_iterator.hpp -..\%__SRC%\misc\build\boost-1.30.2\boost\token_functions.hpp %_DEST%\inc%_EXT%\boost\token_functions.hpp -..\%__SRC%\misc\build\boost-1.30.2\boost\enable_shared_from_this.hpp %_DEST%\inc%_EXT%\boost\enable_shared_from_this.hpp -..\%__SRC%\misc\build\boost-1.30.2\boost\array.hpp %_DEST%\inc%_EXT%\boost\array.hpp - -..\%__SRC%\misc\build\boost-1.30.2\boost\cast.hpp %_DEST%\inc%_EXT%\boost\cast.hpp -..\%__SRC%\misc\build\boost-1.30.2\boost\enable_shared_from_this.hpp %_DEST%\inc%_EXT%\boost\enable_shared_from_this.hpp - -..\%__SRC%\misc\build\boost-1.30.2\boost\function.hpp %_DEST%\inc%_EXT%\boost\function.hpp -mkdir: %_DEST%\inc%_EXT%\boost\function -..\%__SRC%\misc\build\boost-1.30.2\boost\function\*.*pp %_DEST%\inc%_EXT%\boost\function\*.*pp -mkdir: %_DEST%\inc%_EXT%\boost\function\detail -..\%__SRC%\misc\build\boost-1.30.2\boost\function\detail\*.*pp %_DEST%\inc%_EXT%\boost\function\detail\*.*pp -mkdir: %_DEST%\inc%_EXT%\boost\pending -..\%__SRC%\misc\build\boost-1.30.2\boost\pending\ct_if.hpp %_DEST%\inc%_EXT%\boost\pending\ct_if.hpp - -..\%__SRC%\misc\build\boost-1.30.2\boost\mem_fn.hpp %_DEST%\inc%_EXT%\boost\mem_fn.hpp -..\%__SRC%\misc\build\boost-1.30.2\boost\get_pointer.hpp %_DEST%\inc%_EXT%\boost\get_pointer.hpp -..\%__SRC%\misc\build\boost-1.30.2\boost\bind.hpp %_DEST%\inc%_EXT%\boost\bind.hpp mkdir: %_DEST%\inc%_EXT%\boost\bind -..\%__SRC%\misc\build\boost-1.30.2\boost\bind\*.*pp %_DEST%\inc%_EXT%\boost\bind\*.*pp - -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\*.*pp %_DEST%\inc%_EXT%\boost\*.*pp - mkdir: %_DEST%\inc%_EXT%\boost\config -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\config\*.*pp %_DEST%\inc%_EXT%\boost\config\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\config\compiler -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\config\compiler\*.*pp %_DEST%\inc%_EXT%\boost\config\compiler\*.*pp +mkdir: %_DEST%\inc%_EXT%\boost\config\no_tr1 mkdir: %_DEST%\inc%_EXT%\boost\config\platform -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\config\platform\*.*pp %_DEST%\inc%_EXT%\boost\config\platform\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\config\stdlib -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\config\stdlib\*.*pp %_DEST%\inc%_EXT%\boost\config\stdlib\*.*pp - mkdir: %_DEST%\inc%_EXT%\boost\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\detail\*.*pp %_DEST%\inc%_EXT%\boost\detail\*.*pp - +mkdir: %_DEST%\inc%_EXT%\boost\function +mkdir: %_DEST%\inc%_EXT%\boost\function\detail +mkdir: %_DEST%\inc%_EXT%\boost\iterator +mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail +mkdir: %_DEST%\inc%_EXT%\boost\exception +mkdir: %_DEST%\inc%_EXT%\boost\exception\detail +mkdir: %_DEST%\inc%_EXT%\boost\function mkdir: %_DEST%\inc%_EXT%\boost\mpl -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\*.*pp %_DEST%\inc%_EXT%\boost\mpl\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_ -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\config\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\config\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\bcc\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551 -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\bcc551\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\gcc\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60 -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\msvc60\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70 -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\msvc70\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\mwcw\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\no_ctps\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\no_ttp\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\plain\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessor\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\range_c\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\limits -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\limits\*.*pp %_DEST%\inc%_EXT%\boost\mpl\limits\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\list -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\list\*.*pp %_DEST%\inc%_EXT%\boost\mpl\list\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_ -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\list\aux_\*.*pp %_DEST%\inc%_EXT%\boost\mpl\list\aux_\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\list\aux_\preprocessed\*.*pp %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\list\aux_\preprocessed\plain\*.*pp %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\math -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\math\*.*pp %_DEST%\inc%_EXT%\boost\mpl\math\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_ -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\preprocessed\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\preprocessed\no_ctps\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\preprocessed\plain\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\preprocessed\typeof_based\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based\*.*pp - +mkdir: %_DEST%\inc%_EXT%\boost\numeric +mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion +mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion\detail +mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas +mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\detail +mkdir: %_DEST%\inc%_EXT%\boost\optional +mkdir: %_DEST%\inc%_EXT%\boost\pending +mkdir: %_DEST%\inc%_EXT%\boost\pool +mkdir: %_DEST%\inc%_EXT%\boost\pool\detail mkdir: %_DEST%\inc%_EXT%\boost\preprocessor -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\arithmetic\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\arithmetic\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\array -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\array\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\array\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\comparison -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\comparison\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\comparison\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\config -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\config\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\config\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\control\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\control\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\control\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\control\detail\edg\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\control\detail\msvc\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\debug -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\debug\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\debug\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\detail\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\facilities -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\facilities\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\facilities\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\iteration\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\iteration\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\iteration\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\iteration\detail\bounds\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\iteration\detail\iter\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\list\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\list\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\list\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\list\detail\edg\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\logical -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\logical\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\logical\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\punctuation -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\punctuation\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\punctuation\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\repetition\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\repetition\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\repetition\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\repetition\detail\edg\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\repetition\detail\msvc\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\selection -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\selection\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\selection\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\seq\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\seq\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\seq\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\slot\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\slot\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\slot\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\tuple\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\tuple\*.*pp - -mkdir: %_DEST%\inc%_EXT%\boost\type_traits -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\type_traits\*.*pp %_DEST%\inc%_EXT%\boost\type_traits\*.*pp -mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\type_traits\detail\*.*pp %_DEST%\inc%_EXT%\boost\type_traits\detail\*.*pp - -mkdir: %_DEST%\inc%_EXT%\boost\utility -..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\utility\*.*pp %_DEST%\inc%_EXT%\boost\utility\*.*pp - - -..\%__SRC%\misc\build\spirit-1.6.1\boost\*.*pp %_DEST%\inc%_EXT%\boost\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\*.*pp %_DEST%\inc%_EXT%\boost\spirit\*.*pp - +mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\attribute\*.*pp %_DEST%\inc%_EXT%\boost\spirit\attribute\*.*pp - mkdir: %_DEST%\inc%_EXT%\boost\spirit\core -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\composite -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\composite\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\composite\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\composite\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\impl\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\meta -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\meta\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\meta\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\meta\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\non_terminal\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\non_terminal\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\primitives -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\primitives\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\primitives\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\primitives\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\scanner -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\scanner\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\scanner\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\scanner\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl\*.*pp - mkdir: %_DEST%\inc%_EXT%\boost\spirit\debug -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\debug\*.*pp %_DEST%\inc%_EXT%\boost\spirit\debug\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\debug\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\debug\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\debug\impl\*.*pp - mkdir: %_DEST%\inc%_EXT%\boost\spirit\dynamic -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\dynamic\*.*pp %_DEST%\inc%_EXT%\boost\spirit\dynamic\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\dynamic\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl\*.*pp - mkdir: %_DEST%\inc%_EXT%\boost\spirit\error_handling -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\error_handling\*.*pp %_DEST%\inc%_EXT%\boost\spirit\error_handling\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\error_handling\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl\*.*pp - +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset +mkdir: %_DEST%\inc%_EXT%\boost\spirit\include mkdir: %_DEST%\inc%_EXT%\boost\spirit\iterator -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\iterator\*.*pp %_DEST%\inc%_EXT%\boost\spirit\iterator\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\iterator\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\iterator\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\iterator\impl\*.*pp - +mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta +mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\phoenix -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\phoenix\*.*pp %_DEST%\inc%_EXT%\boost\spirit\phoenix\*.*pp - mkdir: %_DEST%\inc%_EXT%\boost\spirit\symbols -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\symbols\*.*pp %_DEST%\inc%_EXT%\boost\spirit\symbols\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\symbols\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\symbols\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\symbols\impl\*.*pp - mkdir: %_DEST%\inc%_EXT%\boost\spirit\tree -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\tree\*.*pp %_DEST%\inc%_EXT%\boost\spirit\tree\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\tree\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\tree\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\tree\impl\*.*pp - mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\utility\*.*pp %_DEST%\inc%_EXT%\boost\spirit\utility\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\utility\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\utility\impl\*.*pp mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset -..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\utility\impl\chset\*.*pp %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset\*.*pp - -mkdir: %_DEST%\inc%_EXT%\boost\pool -..\%__SRC%\misc\build\boost-1.30.2\boost\pool\*.hpp %_DEST%\inc%_EXT%\boost\pool -mkdir: %_DEST%\inc%_EXT%\boost\pool\detail -..\%__SRC%\misc\build\boost-1.30.2\boost\pool\detail\*.hpp %_DEST%\inc%_EXT%\boost\pool\detail -..\%__SRC%\misc\build\boost-1.30.2\boost\pool\detail\*.inc %_DEST%\inc%_EXT%\boost\pool\detail - +mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr +mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr\detail mkdir: %_DEST%\inc%_EXT%\boost\tuple -..\%__SRC%\misc\build\boost-1.30.2\boost\tuple\*.hpp %_DEST%\inc%_EXT%\boost\tuple mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail -..\%__SRC%\misc\build\boost-1.30.2\boost\tuple\detail\*.hpp %_DEST%\inc%_EXT%\boost\tuple\detail - -mkdir: %_DEST%\inc%_EXT%\boost\numeric -mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion -mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion\detail -mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas -mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\detail -..\%__SRC%\misc\build\boost-1.30.2\boost\numeric\ublas\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\*.hpp - -mkdir: %_DEST%\inc%_EXT%\boost\config\no_tr1 -mkdir: %_DEST%\inc%_EXT%\boost\optional - -..\%__SRC%\misc\build\boost_1_34_1\boost\* %_DEST%\inc%_EXT%\boost -..\%__SRC%\misc\build\boost_1_34_1\boost\function\* %_DEST%\inc%_EXT%\boost\function -..\%__SRC%\misc\build\boost_1_34_1\boost\function\detail\* %_DEST%\inc%_EXT%\boost\function\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\pending\* %_DEST%\inc%_EXT%\boost\pending -..\%__SRC%\misc\build\boost_1_34_1\boost\bind\* %_DEST%\inc%_EXT%\boost\bind -..\%__SRC%\misc\build\boost_1_34_1\boost\config\* %_DEST%\inc%_EXT%\boost\config -..\%__SRC%\misc\build\boost_1_34_1\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler -..\%__SRC%\misc\build\boost_1_34_1\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform -..\%__SRC%\misc\build\boost_1_34_1\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib -..\%__SRC%\misc\build\boost_1_34_1\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1 -..\%__SRC%\misc\build\boost_1_34_1\boost\detail\* %_DEST%\inc%_EXT%\boost\detail -mkdir: %_DEST%\inc%_EXT%\boost\iterator -mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\iterator\* %_DEST%\inc%_EXT%\boost\iterator -..\%__SRC%\misc\build\boost_1_34_1\boost\iterator\detail\* %_DEST%\inc%_EXT%\boost\iterator\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\* %_DEST%\inc%_EXT%\boost\mpl -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\* %_DEST%\inc%_EXT%\boost\mpl\aux_ -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\bcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\bcc551\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551 -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\gcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\msvc60\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60 -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\msvc70\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70 -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\mwcw\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\no_ttp\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessor\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\range_c\* %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\limits\* %_DEST%\inc%_EXT%\boost\mpl\limits -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\list\* %_DEST%\inc%_EXT%\boost\mpl\list -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\list\aux_\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_ -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\list\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\list\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\math\* %_DEST%\inc%_EXT%\boost\mpl\math -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\* %_DEST%\inc%_EXT%\boost\mpl\vector -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_ -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain -..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\preprocessed\typeof_based\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based - -..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\*.hpp %_DEST%\inc%_EXT%\boost\numeric\*.hpp -..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\conversion\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\*.hpp -..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\conversion\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\detail\*.hpp -..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\ublas\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\*.hpp -..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\ublas\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\detail\*.hpp - -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\* %_DEST%\inc%_EXT%\boost\preprocessor -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\arithmetic\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\arithmetic\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\array\* %_DEST%\inc%_EXT%\boost\preprocessor\array -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\comparison\* %_DEST%\inc%_EXT%\boost\preprocessor\comparison -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\config\* %_DEST%\inc%_EXT%\boost\preprocessor\config -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\control\* %_DEST%\inc%_EXT%\boost\preprocessor\control -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\control\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\control\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\control\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\debug\* %_DEST%\inc%_EXT%\boost\preprocessor\debug -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\facilities\* %_DEST%\inc%_EXT%\boost\preprocessor\facilities -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\iteration\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\iteration\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\iteration\detail\bounds\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\iteration\detail\iter\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\list\* %_DEST%\inc%_EXT%\boost\preprocessor\list -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\list\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\list\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\logical\* %_DEST%\inc%_EXT%\boost\preprocessor\logical -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\punctuation\* %_DEST%\inc%_EXT%\boost\preprocessor\punctuation -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\selection\* %_DEST%\inc%_EXT%\boost\preprocessor\selection -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\seq\* %_DEST%\inc%_EXT%\boost\preprocessor\seq -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\seq\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple -..\%__SRC%\misc\build\boost_1_34_1\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits -..\%__SRC%\misc\build\boost_1_34_1\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\utility\* %_DEST%\inc%_EXT%\boost\utility -..\%__SRC%\misc\build\boost_1_34_1\boost\pool\* %_DEST%\inc%_EXT%\boost\pool -..\%__SRC%\misc\build\boost_1_34_1\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\tuple\* %_DEST%\inc%_EXT%\boost\tuple -..\%__SRC%\misc\build\boost_1_34_1\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\optional\* %_DEST%\inc%_EXT%\boost\optional +mkdir: %_DEST%\inc%_EXT%\boost\type_traits +mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail +mkdir: %_DEST%\inc%_EXT%\boost\utility +mkdir: %_DEST%\inc%_EXT%\boost\variant +mkdir: %_DEST%\inc%_EXT%\boost\variant\detail -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit -mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\attribute\* %_DEST%\inc%_EXT%\boost\spirit\attribute -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\* %_DEST%\inc%_EXT%\boost\spirit\core -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\core\composite -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\meta\* %_DEST%\inc%_EXT%\boost\spirit\core\meta -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\non_terminal\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\primitives\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\debug\* %_DEST%\inc%_EXT%\boost\spirit\debug -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\debug\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\dynamic -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\error_handling -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\iterator\* %_DEST%\inc%_EXT%\boost\spirit\iterator -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\iterator\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta -mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\meta\* %_DEST%\inc%_EXT%\boost\spirit\meta -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\meta\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\phoenix -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\symbols\* %_DEST%\inc%_EXT%\boost\spirit\symbols -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\symbols\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\tree\* %_DEST%\inc%_EXT%\boost\spirit\tree -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\tree\impl\* %_DEST%\inc%_EXT%\boost\spirit\tree\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\utility\* %_DEST%\inc%_EXT%\boost\spirit\utility -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl -..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset +..\%__SRC%\inc\boost\* %_DEST%\inc%_EXT%\boost +..\%__SRC%\inc\boost\bind\* %_DEST%\inc%_EXT%\boost\bind +..\%__SRC%\inc\boost\config\* %_DEST%\inc%_EXT%\boost\config +..\%__SRC%\inc\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler +..\%__SRC%\inc\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1 +..\%__SRC%\inc\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform +..\%__SRC%\inc\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib +..\%__SRC%\inc\boost\detail\* %_DEST%\inc%_EXT%\boost\detail +..\%__SRC%\inc\boost\function\* %_DEST%\inc%_EXT%\boost\function +..\%__SRC%\inc\boost\function\detail\* %_DEST%\inc%_EXT%\boost\function\detail +..\%__SRC%\inc\boost\iterator\* %_DEST%\inc%_EXT%\boost\iterator +..\%__SRC%\inc\boost\iterator\detail\* %_DEST%\inc%_EXT%\boost\iterator\detail +..\%__SRC%\inc\boost\exception\* %_DEST%\inc%_EXT%\boost\exception +..\%__SRC%\inc\boost\exception\detail\* %_DEST%\inc%_EXT%\boost\exception\detail +..\%__SRC%\inc\boost\mpl\* %_DEST%\inc%_EXT%\boost\mpl +..\%__SRC%\inc\boost\mpl\aux_\* %_DEST%\inc%_EXT%\boost\mpl\aux_ +..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc551\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551 +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\gcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc60\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60 +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc70\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70 +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\mwcw\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\no_ttp\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\aux_\preprocessor\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor +..\%__SRC%\inc\boost\mpl\aux_\range_c\* %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c +..\%__SRC%\inc\boost\mpl\limits\* %_DEST%\inc%_EXT%\boost\mpl\limits +..\%__SRC%\inc\boost\mpl\list\* %_DEST%\inc%_EXT%\boost\mpl\list +..\%__SRC%\inc\boost\mpl\list\aux_\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_ +..\%__SRC%\inc\boost\mpl\list\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed +..\%__SRC%\inc\boost\mpl\list\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\math\* %_DEST%\inc%_EXT%\boost\mpl\math +..\%__SRC%\inc\boost\mpl\vector\* %_DEST%\inc%_EXT%\boost\mpl\vector +..\%__SRC%\inc\boost\mpl\vector\aux_\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_ +..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed +..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps +..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\typeof_based\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based +..\%__SRC%\inc\boost\numeric\*.hpp %_DEST%\inc%_EXT%\boost\numeric\*.hpp +..\%__SRC%\inc\boost\numeric\conversion\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\*.hpp +..\%__SRC%\inc\boost\numeric\conversion\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\detail\*.hpp +..\%__SRC%\inc\boost\numeric\ublas\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\*.hpp +..\%__SRC%\inc\boost\numeric\ublas\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\detail\*.hpp +..\%__SRC%\inc\boost\optional\* %_DEST%\inc%_EXT%\boost\optional +..\%__SRC%\inc\boost\pending\* %_DEST%\inc%_EXT%\boost\pending +..\%__SRC%\inc\boost\pool\* %_DEST%\inc%_EXT%\boost\pool +..\%__SRC%\inc\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail +..\%__SRC%\inc\boost\preprocessor\* %_DEST%\inc%_EXT%\boost\preprocessor +..\%__SRC%\inc\boost\preprocessor\arithmetic\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic +..\%__SRC%\inc\boost\preprocessor\arithmetic\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail +..\%__SRC%\inc\boost\preprocessor\array\* %_DEST%\inc%_EXT%\boost\preprocessor\array +..\%__SRC%\inc\boost\preprocessor\comparison\* %_DEST%\inc%_EXT%\boost\preprocessor\comparison +..\%__SRC%\inc\boost\preprocessor\config\* %_DEST%\inc%_EXT%\boost\preprocessor\config +..\%__SRC%\inc\boost\preprocessor\control\* %_DEST%\inc%_EXT%\boost\preprocessor\control +..\%__SRC%\inc\boost\preprocessor\control\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail +..\%__SRC%\inc\boost\preprocessor\control\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg +..\%__SRC%\inc\boost\preprocessor\control\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc +..\%__SRC%\inc\boost\preprocessor\debug\* %_DEST%\inc%_EXT%\boost\preprocessor\debug +..\%__SRC%\inc\boost\preprocessor\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\detail +..\%__SRC%\inc\boost\preprocessor\facilities\* %_DEST%\inc%_EXT%\boost\preprocessor\facilities +..\%__SRC%\inc\boost\preprocessor\iteration\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration +..\%__SRC%\inc\boost\preprocessor\iteration\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail +..\%__SRC%\inc\boost\preprocessor\iteration\detail\bounds\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds +..\%__SRC%\inc\boost\preprocessor\iteration\detail\iter\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter +..\%__SRC%\inc\boost\preprocessor\list\* %_DEST%\inc%_EXT%\boost\preprocessor\list +..\%__SRC%\inc\boost\preprocessor\list\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail +..\%__SRC%\inc\boost\preprocessor\list\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg +..\%__SRC%\inc\boost\preprocessor\logical\* %_DEST%\inc%_EXT%\boost\preprocessor\logical +..\%__SRC%\inc\boost\preprocessor\punctuation\* %_DEST%\inc%_EXT%\boost\preprocessor\punctuation +..\%__SRC%\inc\boost\preprocessor\repetition\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition +..\%__SRC%\inc\boost\preprocessor\repetition\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail +..\%__SRC%\inc\boost\preprocessor\repetition\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg +..\%__SRC%\inc\boost\preprocessor\repetition\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc +..\%__SRC%\inc\boost\preprocessor\selection\* %_DEST%\inc%_EXT%\boost\preprocessor\selection +..\%__SRC%\inc\boost\preprocessor\seq\* %_DEST%\inc%_EXT%\boost\preprocessor\seq +..\%__SRC%\inc\boost\preprocessor\seq\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail +..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot +..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail +..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple +..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit +..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor +..\%__SRC%\inc\boost\spirit\attribute\* %_DEST%\inc%_EXT%\boost\spirit\attribute +..\%__SRC%\inc\boost\spirit\core\* %_DEST%\inc%_EXT%\boost\spirit\core +..\%__SRC%\inc\boost\spirit\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\core\composite +..\%__SRC%\inc\boost\spirit\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl +..\%__SRC%\inc\boost\spirit\core\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\impl +..\%__SRC%\inc\boost\spirit\core\meta\* %_DEST%\inc%_EXT%\boost\spirit\core\meta +..\%__SRC%\inc\boost\spirit\core\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl +..\%__SRC%\inc\boost\spirit\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal +..\%__SRC%\inc\boost\spirit\core\non_terminal\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl +..\%__SRC%\inc\boost\spirit\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives +..\%__SRC%\inc\boost\spirit\core\primitives\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl +..\%__SRC%\inc\boost\spirit\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner +..\%__SRC%\inc\boost\spirit\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl +..\%__SRC%\inc\boost\spirit\debug\* %_DEST%\inc%_EXT%\boost\spirit\debug +..\%__SRC%\inc\boost\spirit\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\debug\impl +..\%__SRC%\inc\boost\spirit\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\dynamic +..\%__SRC%\inc\boost\spirit\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl +..\%__SRC%\inc\boost\spirit\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\error_handling +..\%__SRC%\inc\boost\spirit\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl +..\%__SRC%\inc\boost\spirit\home\* %_DEST%\inc%_EXT%\boost\spirit\home +..\%__SRC%\inc\boost\spirit\home\classic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic +..\%__SRC%\inc\boost\spirit\home\classic\actor\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor +..\%__SRC%\inc\boost\spirit\home\classic\actor\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl +..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug +..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta +..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core +..\%__SRC%\inc\boost\spirit\home\classic\core\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner +..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal +..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives +..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite +..\%__SRC%\inc\boost\spirit\home\classic\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl +..\%__SRC%\inc\boost\spirit\home\classic\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling +..\%__SRC%\inc\boost\spirit\home\classic\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl +..\%__SRC%\inc\boost\spirit\home\classic\iterator\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator +..\%__SRC%\inc\boost\spirit\home\classic\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl +..\%__SRC%\inc\boost\spirit\home\classic\utility\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility +..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl +..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset +..\%__SRC%\inc\boost\spirit\include\* %_DEST%\inc%_EXT%\boost\spirit\include +..\%__SRC%\inc\boost\spirit\iterator\* %_DEST%\inc%_EXT%\boost\spirit\iterator +..\%__SRC%\inc\boost\spirit\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\iterator\impl +..\%__SRC%\inc\boost\spirit\meta\* %_DEST%\inc%_EXT%\boost\spirit\meta +..\%__SRC%\inc\boost\spirit\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\meta\impl +..\%__SRC%\inc\boost\spirit\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\phoenix +..\%__SRC%\inc\boost\spirit\symbols\* %_DEST%\inc%_EXT%\boost\spirit\symbols +..\%__SRC%\inc\boost\spirit\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\symbols\impl +..\%__SRC%\inc\boost\spirit\tree\* %_DEST%\inc%_EXT%\boost\spirit\tree +..\%__SRC%\inc\boost\spirit\tree\impl\* %_DEST%\inc%_EXT%\boost\spirit\tree\impl +..\%__SRC%\inc\boost\spirit\utility\* %_DEST%\inc%_EXT%\boost\spirit\utility +..\%__SRC%\inc\boost\spirit\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl +..\%__SRC%\inc\boost\spirit\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset +..\%__SRC%\inc\boost\smart_ptr\* %_DEST%\inc%_EXT%\boost\smart_ptr +..\%__SRC%\inc\boost\smart_ptr\detail\* %_DEST%\inc%_EXT%\boost\smart_ptr\detail +..\%__SRC%\inc\boost\tuple\* %_DEST%\inc%_EXT%\boost\tuple +..\%__SRC%\inc\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail +..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits +..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail +..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility +..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant +..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail diff --git a/boost/spirit-1.6.1.patch b/boost/spirit-1.6.1.patch deleted file mode 100644 index 66adf6ba1ab5..000000000000 --- a/boost/spirit-1.6.1.patch +++ /dev/null @@ -1,1748 +0,0 @@ -*** misc/spirit-1.6.1/boost/spirit/core/composite/actions.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/composite/actions.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 11,16 **** ---- 11,21 ---- - #ifndef BOOST_SPIRIT_ACTIONS_HPP - #define BOOST_SPIRIT_ACTIONS_HPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - #include <algorithm> - -*************** -*** 345,349 **** ---- 350,358 ---- - } - - }} // namespace boost::spirit -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif -*** misc/spirit-1.6.1/boost/spirit/core/composite/composite.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/composite/composite.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 65,75 **** - unary(BaseT const& base) - : base_t(base) {} - -! unary(param_t s) -! : base_t(s) {} - -! unary(BaseT const& base, param_t s) -! : base_t(base, s) {} - - return_t - subject() const ---- 65,75 ---- - unary(BaseT const& base) - : base_t(base) {} - -! unary(param_t _s) -! : base_t(_s) {} - -! unary(BaseT const& _base, param_t _s) -! : base_t(_base, _s) {} - - return_t - subject() const -*** misc/spirit-1.6.1/boost/spirit/core/composite/epsilon.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/composite/epsilon.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 12,17 **** ---- 12,22 ---- - #ifndef BOOST_SPIRIT_EPSILON_HPP - #define BOOST_SPIRIT_EPSILON_HPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - //////////////////////////////////////////////////////////////////////////////// - #if !defined(BOOST_SPIRIT_PARSER_HPP) - #include "boost/spirit/core/parser.hpp" -*************** -*** 70,76 **** - private: - }; - -! #if BOOST_WORKAROUND(BOOST_MSVC, == 1310) // VC 7.1 - template <typename CondT> - inline condition_parser<CondT, false> - operator~(condition_parser<CondT, true> const& p) ---- 75,81 ---- - private: - }; - -! #if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x550)) - template <typename CondT> - inline condition_parser<CondT, false> - operator~(condition_parser<CondT, true> const& p) -*************** -*** 287,291 **** ---- 292,300 ---- - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif -*** misc/spirit-1.6.1/boost/spirit/core/composite/impl/composite.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/composite.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 112,120 **** - typedef typename base_t::return_t return_t; - - subject() : base_t() {} -! subject(BaseT const& base) : base_t(base) {} -! subject(param_t s) : base_t(s) {} -! subject(BaseT const& base, param_t s) : base_t(base, s) {} - }; - - ////////////////////////////////// ---- 112,120 ---- - typedef typename base_t::return_t return_t; - - subject() : base_t() {} -! subject(BaseT const& _base) : base_t(_base) {} -! subject(param_t _s) : base_t(_s) {} -! subject(BaseT const& _base, param_t _s) : base_t(_base, _s) {} - }; - - ////////////////////////////////// -*************** -*** 126,134 **** - typedef typename base_t::return_t return_t; - - left_subject() : base_t() {} -! left_subject(BaseT const& base) : base_t(base) {} -! left_subject(param_t s) : base_t(s) {} -! left_subject(BaseT const& base, param_t s) : base_t(base, s) {} - - return_t - left() const { return base_t::get(); } ---- 126,134 ---- - typedef typename base_t::return_t return_t; - - left_subject() : base_t() {} -! left_subject(BaseT const& _base) : base_t(_base) {} -! left_subject(param_t _s) : base_t(_s) {} -! left_subject(BaseT const& _base, param_t _s) : base_t(_base, _s) {} - - return_t - left() const { return base_t::get(); } -*************** -*** 143,151 **** - typedef typename base_t::return_t return_t; - - right_subject() : base_t() {} -! right_subject(BaseT const& base) : base_t(base) {} -! right_subject(param_t s) : base_t(s) {} -! right_subject(BaseT const& base, param_t s) : base_t(base, s) {} - - return_t - right() const { return base_t::get(); } ---- 143,151 ---- - typedef typename base_t::return_t return_t; - - right_subject() : base_t() {} -! right_subject(BaseT const& _base) : base_t(_base) {} -! right_subject(param_t _s) : base_t(_s) {} -! right_subject(BaseT const& _base, param_t _s) : base_t(_base, _s) {} - - return_t - right() const { return base_t::get(); } -*** misc/spirit-1.6.1/boost/spirit/core/composite/impl/operators.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/operators.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 12,17 **** ---- 12,21 ---- - #if !defined(BOOST_SPIRIT_OPERATORS_IPP) - #define BOOST_SPIRIT_OPERATORS_IPP - -+ #if defined __SUNPRO_CC -+ #pragma disable_warn -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - namespace boost { namespace spirit { - -*************** -*** 664,668 **** ---- 668,676 ---- - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit -+ -+ #if defined __SUNPRO_CC -+ #pragma enable_warn -+ #endif - - #endif -*** misc/spirit-1.6.1/boost/spirit/core/impl/match.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/impl/match.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 154,167 **** - { return nil_t(); } - }; - -! #if !defined(__BORLANDC__) - struct dummy { void nonnull() {}; }; - typedef void (dummy::*safe_bool)(); - #else - typedef bool safe_bool; - #endif - -! #if !defined(__BORLANDC__) - #define BOOST_SPIRIT_SAFE_BOOL(cond) ((cond) ? &impl::dummy::nonnull : 0) - #else - #define BOOST_SPIRIT_SAFE_BOOL(cond) (cond) ---- 154,167 ---- - { return nil_t(); } - }; - -! #if !defined(__BORLANDC__) && !defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3 - struct dummy { void nonnull() {}; }; - typedef void (dummy::*safe_bool)(); - #else - typedef bool safe_bool; - #endif - -! #if !defined(__BORLANDC__) && !defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3 - #define BOOST_SPIRIT_SAFE_BOOL(cond) ((cond) ? &impl::dummy::nonnull : 0) - #else - #define BOOST_SPIRIT_SAFE_BOOL(cond) (cond) -*** misc/spirit-1.6.1/boost/spirit/core/impl/parser.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/impl/parser.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 11,16 **** ---- 11,20 ---- - #if !defined(BOOST_SPIRIT_PARSER_IPP) - #define BOOST_SPIRIT_PARSER_IPP - -+ #if defined __SUNPRO_CC -+ #pragma disable_warn -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - namespace boost { namespace spirit { - -*************** -*** 51,56 **** ---- 55,64 ---- - } - - }} // namespace boost::spirit -+ -+ #if defined __SUNPRO_CC -+ #pragma enable_warn -+ #endif - - #endif - -*** misc/spirit-1.6.1/boost/spirit/core/match.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/match.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 60,70 **** - : len(-1), val(impl::match_attr<T>::get_default()) {} - - explicit -! match(unsigned length) -! : len(length), val((impl::match_attr<T>::get_default())) {} - -! match(unsigned length, param_type val_) -! : len(length), val(val_) {} - - operator impl::safe_bool() const - { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); } ---- 60,70 ---- - : len(-1), val(impl::match_attr<T>::get_default()) {} - - explicit -! match(unsigned _length) -! : len(_length), val((impl::match_attr<T>::get_default())) {} - -! match(unsigned _length, param_type val_) -! : len(_length), val(val_) {} - - operator impl::safe_bool() const - { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); } -*************** -*** 120,130 **** - : len(-1) {} - - explicit -! match(unsigned length) -! : len(length) {} - -! match(unsigned length, nil_t) -! : len(length) {} - - operator impl::safe_bool() const - { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); } ---- 120,130 ---- - : len(-1) {} - - explicit -! match(unsigned _length) -! : len(_length) {} - -! match(unsigned _length, nil_t) -! : len(_length) {} - - operator impl::safe_bool() const - { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); } -*** misc/spirit-1.6.1/boost/spirit/core/meta/impl/fundamental.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/meta/impl/fundamental.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 11,16 **** ---- 11,20 ---- - #if !defined(BOOST_SPIRIT_FUNDAMENTAL_IPP) - #define BOOST_SPIRIT_FUNDAMENTAL_IPP - -+ #if defined __SUNPRO_CC -+ #pragma disable_warn -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - namespace boost { namespace spirit { - -*************** -*** 302,306 **** ---- 306,314 ---- - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit -+ -+ #if defined __SUNPRO_CC -+ #pragma enable_warn -+ #endif - - #endif // !defined(BOOST_SPIRIT_FUNDAMENTAL_IPP) -*** misc/spirit-1.6.1/boost/spirit/core/non_terminal/impl/grammar.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/non_terminal/impl/grammar.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 243,249 **** - ////////////////////////////////// - template<typename GrammarT> - inline void -! grammar_destruct(GrammarT* self) - { - #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) - typedef impl::grammar_helper_base<GrammarT> helper_base_t; ---- 243,255 ---- - ////////////////////////////////// - template<typename GrammarT> - inline void -! grammar_destruct(GrammarT* -! #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) -! # if !defined(__GNUC__) || (__GNUC__ > 2) -! self -! #endif -! #endif -! ) - { - #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) - typedef impl::grammar_helper_base<GrammarT> helper_base_t; -*** misc/spirit-1.6.1/boost/spirit/core/non_terminal/subrule.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/non_terminal/subrule.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 228,234 **** - subrule_list< - subrule_parser<ID2, DefT2, ContextT2>, - nil_t> > -! operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const - { - return subrule_list< - self_t, ---- 228,234 ---- - subrule_list< - subrule_parser<ID2, DefT2, ContextT2>, - nil_t> > -! operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const - { - return subrule_list< - self_t, -*************** -*** 238,244 **** - *this, - subrule_list< - subrule_parser<ID2, DefT2, ContextT2>, nil_t>( -! rhs, nil_t())); - } - - typename DefT::embed_t rhs; ---- 238,244 ---- - *this, - subrule_list< - subrule_parser<ID2, DefT2, ContextT2>, nil_t>( -! _rhs, nil_t())); - } - - typename DefT::embed_t rhs; -*************** -*** 276,285 **** - parse_main(ScannerT const& scan) const - { - typedef typename parser_result<self_t, ScannerT>::type result_t; -! result_t result; - impl::parse_subrule<result_t, ScannerT, ID>:: -! do_(result, scan); -! return result; - } - - template <typename ScannerT> ---- 276,285 ---- - parse_main(ScannerT const& scan) const - { - typedef typename parser_result<self_t, ScannerT>::type result_t; -! result_t _result; - impl::parse_subrule<result_t, ScannerT, ID>:: -! do_(_result, scan); -! return _result; - } - - template <typename ScannerT> -*** misc/spirit-1.6.1/boost/spirit/core/scanner/impl/skipper.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/scanner/impl/skipper.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 11,16 **** ---- 11,20 ---- - #if !defined(BOOST_SPIRIT_SKIPPER_IPP) - #define BOOST_SPIRIT_SKIPPER_IPP - -+ #if defined __SUNPRO_CC -+ #pragma disable_warn -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - namespace boost { namespace spirit { - -*************** -*** 175,180 **** ---- 179,188 ---- - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit -+ -+ #if defined __SUNPRO_CC -+ #pragma enable_warn -+ #endif - - #endif - -*** misc/spirit-1.6.1/boost/spirit/core/scanner/scanner.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/core/scanner/scanner.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 18,23 **** ---- 18,26 ---- - #include <iterator> - - #include "boost/config.hpp" -+ #ifdef BOOST_NO_STD_ITERATOR_TRAITS -+ #include "boost/iterator_adaptors.hpp" -+ #endif - #include "boost/spirit/core/match.hpp" - #include "boost/spirit/core/non_terminal/parser_id.hpp" - -*************** -*** 236,245 **** ---- 239,255 ---- - typedef IteratorT iterator_t; - typedef PoliciesT policies_t; - -+ #ifdef BOOST_NO_STD_ITERATOR_TRAITS -+ typedef typename boost::detail::iterator_traits<IteratorT>::value_type -+ value_t; -+ typedef typename boost::detail::iterator_traits<IteratorT>::reference -+ ref_t; -+ #else - typedef typename BOOST_SPIRIT_IT_NS::iterator_traits<IteratorT>::value_type - value_t; - typedef typename BOOST_SPIRIT_IT_NS::iterator_traits<IteratorT>::reference - ref_t; -+ #endif - typedef typename boost::call_traits<IteratorT>::param_type - iter_param_t; - -*************** -*** 260,281 **** - bool - at_end() const - { -! typedef typename PoliciesT::iteration_policy_t iteration_policy_t; -! return iteration_policy_t::at_end(*this); - } - - value_t - operator*() const - { -! typedef typename PoliciesT::iteration_policy_t iteration_policy_t; -! return iteration_policy_t::filter(iteration_policy_t::get(*this)); - } - - scanner const& - operator++() const - { -! typedef typename PoliciesT::iteration_policy_t iteration_policy_t; -! iteration_policy_t::advance(*this); - return *this; - } - ---- 270,291 ---- - bool - at_end() const - { -! typedef typename PoliciesT::iteration_policy_t _iteration_policy_t; -! return _iteration_policy_t::at_end(*this); - } - - value_t - operator*() const - { -! typedef typename PoliciesT::iteration_policy_t _iteration_policy_t; -! return _iteration_policy_t::filter(_iteration_policy_t::get(*this)); - } - - scanner const& - operator++() const - { -! typedef typename PoliciesT::iteration_policy_t _iteration_policy_t; -! _iteration_policy_t::advance(*this); - return *this; - } - -*** misc/spirit-1.6.1/boost/spirit/error_handling/exceptions.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/error_handling/exceptions.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 38,44 **** - - parser_error_base() {} - virtual ~parser_error_base() throw() {} -! parser_error_base(parser_error_base const&) {} - parser_error_base& operator=(parser_error_base const&) - { return *this; } - }; ---- 38,44 ---- - - parser_error_base() {} - virtual ~parser_error_base() throw() {} -! parser_error_base(parser_error_base const&) : std::exception() {} - parser_error_base& operator=(parser_error_base const&) - { return *this; } - }; -*************** -*** 104,111 **** - typedef unary<ParserT, parser<self_t> > base_t; - typedef unary_parser_category parser_category_t; - -! assertive_parser(ParserT const& parser, ErrorDescrT descriptor) -! : base_t(parser), descriptor(descriptor) {} - - template <typename ScannerT> - struct result ---- 104,111 ---- - typedef unary<ParserT, parser<self_t> > base_t; - typedef unary_parser_category parser_category_t; - -! assertive_parser(ParserT const& parser, ErrorDescrT desc) -! : base_t(parser), descriptor(desc) {} - - template <typename ScannerT> - struct result -*************** -*** 200,208 **** - - error_status( - result_t result_ = fail, -! int length = -1, - T const& value_ = T()) -! : result(result_), length(length), value(value_) {} - - result_t result; - int length; ---- 200,208 ---- - - error_status( - result_t result_ = fail, -! int length_ = -1, - T const& value_ = T()) -! : result(result_), length(length_), value(value_) {} - - result_t result; - int length; -*** misc/spirit-1.6.1/boost/spirit/iterator/impl/file_iterator.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/iterator/impl/file_iterator.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 24,29 **** ---- 24,33 ---- - #if !defined FILE_ITERATOR_IPP - #define FILE_ITERATOR_IPP - -+ #if defined __SUNPRO_CC -+ #pragma disable_warn -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - #include <cassert> - #include <fcntl.h> -*************** -*** 489,493 **** ---- 493,501 ---- - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit -+ -+ #if defined __SUNPRO_CC -+ #pragma enable_warn -+ #endif - - #endif // #if !defined FILE_ITERATOR_IPP -*** misc/spirit-1.6.1/boost/spirit/iterator/multi_pass.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/iterator/multi_pass.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 11,16 **** ---- 11,21 ---- - #ifndef BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP - #define BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include <boost/config.hpp> - #include <boost/throw_exception.hpp> - #include <boost/detail/workaround.hpp> -*************** -*** 1313,1317 **** ---- 1318,1327 ---- - - #undef BOOST_SPIRIT_IT_NS - #endif // defined(BOOST_MSVC) && (BOOST_MSVC <= 1300) -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -+ - #endif // BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP - -*** misc/spirit-1.6.1/boost/spirit/utility/chset.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/utility/chset.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 12,17 **** ---- 12,22 ---- - #ifndef BOOST_SPIRIT_CHSET_HPP - #define BOOST_SPIRIT_CHSET_HPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - #include <boost/shared_ptr.hpp> - #include <boost/spirit/core/primitives/primitives.hpp> -*************** -*** 229,234 **** ---- 234,243 ---- - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif - -*** misc/spirit-1.6.1/boost/spirit/utility/chset_operators.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/utility/chset_operators.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 12,17 **** ---- 12,22 ---- - #ifndef BOOST_SPIRIT_CHSET_OPERATORS_HPP - #define BOOST_SPIRIT_CHSET_OPERATORS_HPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - #include <boost/spirit/utility/chset.hpp> - -*** misc/spirit-1.6.1/boost/spirit/utility/confix.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/utility/confix.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 389,395 **** - as_parser<OpenT>::convert(open), - as_parser<CloseT>::convert(close) - ); -! }; - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit ---- 389,395 ---- - as_parser<OpenT>::convert(open), - as_parser<CloseT>::convert(close) - ); -! } - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit -*** misc/spirit-1.6.1/boost/spirit/utility/functor_parser.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/utility/functor_parser.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 54,66 **** - typedef typename ScannerT::iterator_t iterator_t; - - iterator_t const s(scan.first); -! functor_result_t result; -! int const len = functor(scan, result); - - if (len < 0) - return scan.no_match(); - else -! return scan.create_match(len, result, s, scan.first); - } - }; - ---- 54,66 ---- - typedef typename ScannerT::iterator_t iterator_t; - - iterator_t const s(scan.first); -! functor_result_t res; -! int const len = functor(scan, res); - - if (len < 0) - return scan.no_match(); - else -! return scan.create_match(len, res, s, scan.first); - } - }; - -*** misc/spirit-1.6.1/boost/spirit/utility/impl/chset.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 12,17 **** ---- 12,22 ---- - #ifndef BOOST_SPIRIT_CHSET_IPP - #define BOOST_SPIRIT_CHSET_IPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - #include <boost/limits.hpp> - #include <boost/spirit/utility/chset.hpp> -*************** -*** 359,364 **** ---- 364,373 ---- - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif - -*** misc/spirit-1.6.1/boost/spirit/utility/impl/chset_operators.ipp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset_operators.ipp Wed Dec 5 10:08:58 2007 -*************** -*** 11,16 **** ---- 11,21 ---- - #ifndef BOOST_SPIRIT_CHSET_OPERATORS_IPP - #define BOOST_SPIRIT_CHSET_OPERATORS_IPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - /////////////////////////////////////////////////////////////////////////////// - #include <boost/limits.hpp> - -*************** -*** 659,664 **** ---- 664,673 ---- - - /////////////////////////////////////////////////////////////////////////////// - }} // namespace boost::spirit -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif - -*** misc/spirit-1.6.1/boost/spirit/utility/loops.hpp Tue Jul 8 04:19:06 2003 ---- misc/build/spirit-1.6.1/boost/spirit/utility/loops.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 47,54 **** - typedef fixed_loop<ParserT, ExactT> self_t; - typedef unary<ParserT, parser<self_t> > base_t; - -! fixed_loop (ParserT const & subject, ExactT const & exact) -! : base_t(subject), m_exact(exact) {} - - template <typename ScannerT> - typename parser_result <self_t, ScannerT>::type ---- 47,54 ---- - typedef fixed_loop<ParserT, ExactT> self_t; - typedef unary<ParserT, parser<self_t> > base_t; - -! fixed_loop (ParserT const & subject_, ExactT const & exact_) -! : base_t(subject_), m_exact(exact_) {} - - template <typename ScannerT> - typename parser_result <self_t, ScannerT>::type -*** misc/spirit-1.6.1/miniboost/boost/concept_check.hpp Tue Jul 8 04:19:09 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/concept_check.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 708,719 **** - function_requires< AssignableConcept<Container> >(); - const_constraints(c); - } -! void const_constraints(const Container& c) { -! i = c.begin(); -! i = c.end(); -! n = c.size(); -! n = c.max_size(); -! b = c.empty(); - } - Container c; - bool b; ---- 708,719 ---- - function_requires< AssignableConcept<Container> >(); - const_constraints(c); - } -! void const_constraints(const Container& cnr) { -! i = cnr.begin(); -! i = cnr.end(); -! n = cnr.size(); -! n = cnr.max_size(); -! b = cnr.empty(); - } - Container c; - bool b; -*************** -*** 777,785 **** - BidirectionalIteratorConcept<const_reverse_iterator> >(); - const_constraints(c); - } -! void const_constraints(const ReversibleContainer& c) { -! const_reverse_iterator i = c.rbegin(); -! i = c.rend(); - } - ReversibleContainer c; - }; ---- 777,785 ---- - BidirectionalIteratorConcept<const_reverse_iterator> >(); - const_constraints(c); - } -! void const_constraints(const ReversibleContainer& cnr) { -! const_reverse_iterator i = cnr.rbegin(); -! i = cnr.rend(); - } - ReversibleContainer c; - }; -*************** -*** 821,828 **** - - const_constraints(c); - } -! void const_constraints(const RandomAccessContainer& c) { -! const_reference r = c[n]; - ignore_unused_variable_warning(r); - } - RandomAccessContainer c; ---- 821,828 ---- - - const_constraints(c); - } -! void const_constraints(const RandomAccessContainer& cnr) { -! const_reference r = cnr[n]; - ignore_unused_variable_warning(r); - } - RandomAccessContainer c; -*************** -*** 925,932 **** - reference r = c.back(); - ignore_unused_variable_warning(r); - } -! void const_constraints(const BackInsertionSequence& c) { -! const_reference r = c.back(); - ignore_unused_variable_warning(r); - }; - BackInsertionSequence c; ---- 925,932 ---- - reference r = c.back(); - ignore_unused_variable_warning(r); - } -! void const_constraints(const BackInsertionSequence& cnr) { -! const_reference r = cnr.back(); - ignore_unused_variable_warning(r); - }; - BackInsertionSequence c; -*************** -*** 947,956 **** - c.erase(r.first, r.second); - const_constraints(c); - } -! void const_constraints(const AssociativeContainer& c) { -! ci = c.find(k); -! n = c.count(k); -! cr = c.equal_range(k); - } - typedef typename AssociativeContainer::iterator iterator; - typedef typename AssociativeContainer::const_iterator const_iterator; ---- 947,956 ---- - c.erase(r.first, r.second); - const_constraints(c); - } -! void const_constraints(const AssociativeContainer& cnr) { -! ci = cnr.find(k); -! n = cnr.count(k); -! cr = cnr.equal_range(k); - } - typedef typename AssociativeContainer::iterator iterator; - typedef typename AssociativeContainer::const_iterator const_iterator; -*** misc/spirit-1.6.1/miniboost/boost/config/compiler/gcc.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/gcc.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 59,65 **** - #endif - // - // last known and checked version is 3.2: -! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 2)) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else ---- 59,66 ---- - #endif - // - // last known and checked version is 3.2: -! // although 3.4+x & 4.x are unchecked, we will give it a try -! #if (__GNUC__ > 4) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else -*** misc/spirit-1.6.1/miniboost/boost/config/compiler/sunpro_cc.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/sunpro_cc.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 45,52 **** - # define BOOST_NO_INTEGRAL_INT64_T - # endif - -! # if (__SUNPRO_CC <= 0x540) || !defined(BOOST_STRICT_CONFIG) - # define BOOST_NO_TEMPLATE_TEMPLATES - # endif - - #define BOOST_COMPILER "Sun compiler version " BOOST_STRINGIZE(__SUNPRO_CC) ---- 45,57 ---- - # define BOOST_NO_INTEGRAL_INT64_T - # endif - -! # if (__SUNPRO_CC <= 0x550) || !defined(BOOST_STRICT_CONFIG) - # define BOOST_NO_TEMPLATE_TEMPLATES -+ // see http://lists.boost.org/MailArchives/boost/msg47184.php -+ // and http://lists.boost.org/MailArchives/boost/msg47220.php -+ # define BOOST_NO_INCLASS_MEMBER_INITIALIZATION -+ # define BOOST_NO_SFINAE -+ # define BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS - # endif - - #define BOOST_COMPILER "Sun compiler version " BOOST_STRINGIZE(__SUNPRO_CC) -*** misc/spirit-1.6.1/miniboost/boost/config/compiler/visualc.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/visualc.hpp Wed Dec 5 10:12:34 2007 -*************** -*** 65,75 **** - # define BOOST_NO_INTRINSIC_WCHAR_T - #endif - -! // -! // check for exception handling support: -! #ifndef _CPPUNWIND -! # define BOOST_NO_EXCEPTIONS -! #endif - - // - // __int64 support: ---- 65,75 ---- - # define BOOST_NO_INTRINSIC_WCHAR_T - #endif - -! // -! // check for exception handling support: -! #ifndef _CPPUNWIND -! # define BOOST_NO_EXCEPTIONS -! #endif - - // - // __int64 support: -*************** -*** 94,99 **** ---- 94,101 ---- - # define BOOST_COMPILER_VERSION 7.0 - # elif _MSC_VER == 1310 - # define BOOST_COMPILER_VERSION 7.1 -+ # elif _MSC_VER == 1400 -+ # define BOOST_COMPILER_VERSION 8.0 - # else - # define BOOST_COMPILER_VERSION _MSC_VER - # endif -*************** -*** 108,121 **** - #endif - // - // last known and checked version is 1310: -! #if (_MSC_VER > 1310) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else - # pragma message("Unknown compiler version - please run the configure tests and report the results") - # endif - #endif -- - - - ---- 110,122 ---- - #endif - // - // last known and checked version is 1310: -! #if (_MSC_VER > 1500) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else - # pragma message("Unknown compiler version - please run the configure tests and report the results") - # endif - #endif - - - -*** misc/spirit-1.6.1/miniboost/boost/config/platform/macos.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/config/platform/macos.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 19,27 **** - # define BOOST_HAS_UNISTD_H - # endif - // boilerplate code: -! # ifndef TARGET_CARBON - # include <boost/config/posix_features.hpp> -! # endif - # ifndef BOOST_HAS_STDINT_H - # define BOOST_HAS_STDINT_H - # endif ---- 19,28 ---- - # define BOOST_HAS_UNISTD_H - # endif - // boilerplate code: -! // See issue #i72248# -! //# ifndef TARGET_CARBON - # include <boost/config/posix_features.hpp> -! //# endif - # ifndef BOOST_HAS_STDINT_H - # define BOOST_HAS_STDINT_H - # endif -*** misc/spirit-1.6.1/miniboost/boost/config/platform/win32.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/config/platform/win32.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 40,45 **** ---- 40,46 ---- - # define NOMINMAX - #endif - -+ #if (_MSC_VER < 1400) - #ifdef BOOST_MSVC - namespace std{ - // Apparently, something in the Microsoft libraries requires the "long" -*************** -*** 65,67 **** ---- 66,69 ---- - using std::min; - using std::max; - # endif -+ #endif -*** misc/spirit-1.6.1/miniboost/boost/config/user.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/config/user.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 66,68 **** ---- 66,74 ---- - // #define BOOST_DISABLE_WIN32 - - -+ // Switch off exception statements if file is compiled without -+ // exception support: -+ #if defined(EXCEPTIONS_OFF) && !defined(BOOST_NO_EXCEPTIONS) -+ #define BOOST_NO_EXCEPTIONS -+ #endif -+ -*** misc/spirit-1.6.1/miniboost/boost/iterator_adaptors.hpp Tue Jul 8 04:19:09 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/iterator_adaptors.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 119,124 **** ---- 119,129 ---- - #ifndef BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_ - # define BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_ - -+ # if defined _MSC_VER -+ # pragma warning(push) -+ # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ # endif -+ - # include <boost/iterator.hpp> - # include <boost/utility.hpp> - # include <boost/compressed_pair.hpp> -*************** -*** 873,879 **** - return policies().dereference(*this); - } - -! #if BOOST_WORKAROUND(BOOST_MSVC, > 0) - # pragma warning(push) - # pragma warning( disable : 4284 ) - #endif ---- 878,884 ---- - return policies().dereference(*this); - } - -! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - # pragma warning(push) - # pragma warning( disable : 4284 ) - #endif -*************** -*** 882,888 **** - operator->() const - { return detail::operator_arrow(*this, iterator_category()); } - -! #if BOOST_WORKAROUND(BOOST_MSVC, > 0) - # pragma warning(pop) - #endif - ---- 887,893 ---- - operator->() const - { return detail::operator_arrow(*this, iterator_category()); } - -! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - # pragma warning(pop) - #endif - -*************** -*** 1430,1435 **** ---- 1435,1443 ---- - } // namespace boost - # undef BOOST_ARG_DEPENDENT_TYPENAME - -+ # if defined _MSC_VER -+ # pragma warning(pop) -+ # endif - - #endif - -*** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/ice_cast.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/ice_cast.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 17,22 **** ---- 17,27 ---- - #ifndef BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED - #define BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/config/workaround.hpp" - - #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \ -*************** -*** 26,31 **** ---- 31,40 ---- - # define BOOST_MPL_AUX_ICE_CAST(T, expr) (T)(expr) - #else - # define BOOST_MPL_AUX_ICE_CAST(T, expr) static_cast<T>(expr) -+ #endif -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) - #endif - - #endif // BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED -*** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/integral_wrapper.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/integral_wrapper.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 17,22 **** ---- 17,27 ---- - - // no include guards, the header is intended for multiple inclusion! - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/ice_cast.hpp" - #include "boost/mpl/aux_/config/nttp.hpp" - #include "boost/mpl/aux_/config/static_constant.hpp" -*************** -*** 84,86 **** ---- 89,95 ---- - #undef AUX_WRAPPER_PARAMS - #undef AUX_WRAPPER_INST - #undef AUX_WRAPPER_VALUE_TYPE -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -*** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/lambda_support.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/lambda_support.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 17,22 **** ---- 17,27 ---- - #ifndef BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED - #define BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/config/lambda.hpp" - - #if !defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT) -*************** -*** 132,136 **** ---- 137,145 ---- - #endif // __EDG_VERSION__ - - #endif // BOOST_MPL_NO_FULL_LAMBDA_SUPPORT -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif // BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED -*** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/logical_op.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/logical_op.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 17,22 **** ---- 17,27 ---- - - // no include guards, the header is intended for multiple inclusion! - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #if !defined(BOOST_MPL_PREPROCESSING_MODE) - # include "boost/mpl/bool.hpp" - # include "boost/mpl/aux_/nested_type_wknd.hpp" -*************** -*** 167,169 **** ---- 172,178 ---- - #undef AUX_LOGICAL_OP_NAME - #undef AUX_LOGICAL_OP_VALUE1 - #undef AUX_LOGICAL_OP_VALUE2 -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif -*** misc/spirit-1.6.1/miniboost/boost/mpl/if.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/mpl/if.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 17,22 **** ---- 17,27 ---- - // - // See http://www.boost.org/libs/mpl for documentation. - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/value_wknd.hpp" - #include "boost/mpl/aux_/ice_cast.hpp" - #include "boost/mpl/aux_/void_spec.hpp" -*************** -*** 173,177 **** ---- 178,186 ---- - - } // namespace mpl - } // namespace boost -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif // BOOST_MPL_IF_HPP_INCLUDED -*** misc/spirit-1.6.1/miniboost/boost/mpl/integral_c.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 18,23 **** ---- 18,28 ---- - // - // See http://www.boost.org/libs/mpl for documentation. - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/integral_c_fwd.hpp" - #include "boost/mpl/aux_/ice_cast.hpp" - #include "boost/mpl/aux_/config/ctps.hpp" -*************** -*** 48,53 **** ---- 53,62 ---- - operator bool() const { return this->value; } - }; - }} -+ #endif -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) - #endif - - #endif // BOOST_MPL_INTEGRAL_C_HPP_INCLUDED -*** misc/spirit-1.6.1/miniboost/boost/mpl/integral_c_fwd.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c_fwd.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 18,23 **** ---- 18,28 ---- - // - // See http://www.boost.org/libs/mpl for documentation. - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/aux_/config/workaround.hpp" - - namespace boost { namespace mpl { -*************** -*** 28,32 **** ---- 33,41 ---- - template< typename T, T N > struct integral_c; - #endif - }} -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif // BOOST_MPL_INTEGRAL_C_FWD_HPP_INCLUDED -*** misc/spirit-1.6.1/miniboost/boost/mpl/is_sequence.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/mpl/is_sequence.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 17,22 **** ---- 17,27 ---- - #ifndef BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED - #define BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/not.hpp" - #include "boost/mpl/or.hpp" - #include "boost/mpl/begin_end.hpp" -*************** -*** 97,101 **** ---- 102,110 ---- - BOOST_MPL_AUX_VOID_SPEC(1, is_sequence) - - }} // namespace boost::mpl -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif // BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED -*** misc/spirit-1.6.1/miniboost/boost/mpl/sequence_tag.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/mpl/sequence_tag.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 17,22 **** ---- 17,27 ---- - #ifndef BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED - #define BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/mpl/sequence_tag_fwd.hpp" - #include "boost/mpl/aux_/has_tag.hpp" - #include "boost/mpl/aux_/has_begin.hpp" -*************** -*** 129,133 **** ---- 134,142 ---- - BOOST_MPL_AUX_VOID_SPEC(1, sequence_tag) - - }} // namespace boost::mpl -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif // BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED -*** misc/spirit-1.6.1/miniboost/boost/optional.hpp Tue Jul 8 04:19:09 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/optional.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 17,22 **** ---- 17,27 ---- - #ifndef BOOST_OPTIONAL_FLC_19NOV2002_HPP - #define BOOST_OPTIONAL_FLC_19NOV2002_HPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include<new> - #include<algorithm> - -*************** -*** 194,200 **** ---- 199,209 ---- - - // implicit conversion to "bool" - // No-throw -+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3 -+ operator bool() const { return m_initialized; } -+ #else - operator unspecified_bool_type() const { return m_initialized ? &this_type::destroy : 0 ; } -+ #endif // defined(__SUNPRO_CC) - - // This is provided for those compilers which don't like the conversion to bool - // on some contexts. -*************** -*** 312,317 **** ---- 321,330 ---- - - - } // namespace boost -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif - -*** misc/spirit-1.6.1/miniboost/boost/scoped_array.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/scoped_array.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 83,94 **** ---- 83,98 ---- - - // implicit conversion to "bool" - -+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3 -+ operator bool() const { return ptr != 0; } -+ #else - typedef T * (this_type::*unspecified_bool_type)() const; - - operator unspecified_bool_type() const // never throws - { - return ptr == 0? 0: &this_type::get; - } -+ #endif // defined(__SUNPRO_CC) - - bool operator! () const // never throws - { -*** misc/spirit-1.6.1/miniboost/boost/scoped_ptr.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/scoped_ptr.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 102,113 **** ---- 102,117 ---- - - // implicit conversion to "bool" - -+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3 -+ operator bool() const { return ptr != 0; } -+ #else - typedef T * (this_type::*unspecified_bool_type)() const; - - operator unspecified_bool_type() const // never throws - { - return ptr == 0? 0: &this_type::get; - } -+ #endif // defined(__SUNPRO_CC) - - bool operator! () const // never throws - { -*** misc/spirit-1.6.1/miniboost/boost/shared_array.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/shared_array.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 94,105 **** ---- 94,109 ---- - - // implicit conversion to "bool" - -+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3 -+ operator bool() const { return px != 0; } -+ #else - typedef T * (this_type::*unspecified_bool_type)() const; - - operator unspecified_bool_type() const // never throws - { - return px == 0? 0: &this_type::get; - } -+ #endif // defined(__SUNPRO_CC) - - bool operator! () const // never throws - { -*** misc/spirit-1.6.1/miniboost/boost/shared_ptr.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/shared_ptr.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 35,41 **** - - #ifdef BOOST_MSVC // moved here to work around VC++ compiler crash - # pragma warning(push) -! # pragma warning(disable:4284) // odd return type for operator-> - #endif - - namespace boost ---- 35,41 ---- - - #ifdef BOOST_MSVC // moved here to work around VC++ compiler crash - # pragma warning(push) -! # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" - #endif - - namespace boost -*************** -*** 246,257 **** ---- 246,261 ---- - - // implicit conversion to "bool" - -+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3 -+ operator bool() const { return px != 0; } -+ #else - typedef T * (this_type::*unspecified_bool_type)() const; - - operator unspecified_bool_type() const // never throws - { - return px == 0? 0: &this_type::get; - } -+ #endif // defined(__SUNPRO_CC) - - // operator! is redundant, but some compilers need it - -*** misc/spirit-1.6.1/miniboost/boost/throw_exception.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/throw_exception.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 29,35 **** - - #ifdef BOOST_NO_EXCEPTIONS - -! void throw_exception(std::exception const & e); // user defined - - #else - ---- 29,36 ---- - - #ifdef BOOST_NO_EXCEPTIONS - -! // void throw_exception(std::exception const & e); // user defined -! inline void throw_exception(std::exception const &) {} - - #else - -*** misc/spirit-1.6.1/miniboost/boost/type_traits/add_reference.hpp Tue Jul 8 04:19:09 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/type_traits/add_reference.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 10,15 **** ---- 10,20 ---- - #ifndef BOOST_TT_ADD_REFERENCE_HPP_INCLUDED - #define BOOST_TT_ADD_REFERENCE_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/type_traits/is_reference.hpp" - #include "boost/detail/workaround.hpp" - #include "boost/config.hpp" -*************** -*** 86,90 **** ---- 91,99 ---- - } // namespace boost - - #include "boost/type_traits/detail/type_trait_undef.hpp" -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif // BOOST_TT_ADD_REFERENCE_HPP_INCLUDED -*** misc/spirit-1.6.1/miniboost/boost/type_traits/is_base_and_derived.hpp Tue Jul 8 04:19:09 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_base_and_derived.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 10,15 **** ---- 10,20 ---- - #ifndef BOOST_TT_IS_BASE_AND_DERIVED_HPP_INCLUDED - #define BOOST_TT_IS_BASE_AND_DERIVED_HPP_INCLUDED - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include "boost/type_traits/is_class.hpp" - #include "boost/type_traits/is_same.hpp" - #include "boost/type_traits/is_convertible.hpp" -*************** -*** 203,207 **** ---- 208,216 ---- - } // namespace boost - - #include "boost/type_traits/detail/bool_trait_undef.hpp" -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif // BOOST_TT_IS_BASE_AND_DERIVED_HPP_INCLUDED -*** misc/spirit-1.6.1/miniboost/boost/type_traits/is_polymorphic.hpp Tue Jul 8 04:19:09 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_polymorphic.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 6,11 **** ---- 6,16 ---- - #ifndef BOOST_TT_IS_POLYMORPHIC_HPP - #define BOOST_TT_IS_POLYMORPHIC_HPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - #include <boost/type_traits/is_class.hpp> - #include <boost/type_traits/remove_cv.hpp> - // should be the last #include -*************** -*** 86,90 **** ---- 91,99 ---- - } // namespace boost - - #include "boost/type_traits/detail/bool_trait_undef.hpp" -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif -*** misc/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp Tue Jul 8 04:19:09 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 72,78 **** - #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT - #undef BOOST_TT_CHOOSE_T - -! template<int TAlign, int Align> - struct is_aligned - { - BOOST_STATIC_CONSTANT(bool, ---- 72,78 ---- - #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT - #undef BOOST_TT_CHOOSE_T - -! template<std::size_t TAlign, std::size_t Align> - struct is_aligned - { - BOOST_STATIC_CONSTANT(bool, -*************** -*** 93,99 **** - - // This alignment method originally due to Brian Parker, implemented by David - // Abrahams, and then ported here by Doug Gregor. -! template <int Align> - class type_with_alignment - { - typedef detail::lower_alignment<Align> t1; ---- 93,99 ---- - - // This alignment method originally due to Brian Parker, implemented by David - // Abrahams, and then ported here by Doug Gregor. -! template <std::size_t Align> - class type_with_alignment - { - typedef detail::lower_alignment<Align> t1; -*** misc/spirit-1.6.1/miniboost/boost/utility/addressof.hpp Tue Jul 8 04:19:09 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/utility/addressof.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 16,21 **** ---- 16,26 ---- - #ifndef BOOST_UTILITY_ADDRESSOF_HPP - # define BOOST_UTILITY_ADDRESSOF_HPP - -+ #if defined _MSC_VER -+ #pragma warning(push) -+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro" -+ #endif -+ - # include <boost/config.hpp> - # include <boost/detail/workaround.hpp> - # if BOOST_WORKAROUND(BOOST_MSVC, == 1300) -*************** -*** 39,43 **** ---- 44,52 ---- - } - - } -+ -+ #if defined _MSC_VER -+ #pragma warning(pop) -+ #endif - - #endif // BOOST_UTILITY_ADDRESSOF_HPP -*** misc/spirit-1.6.1/miniboost/boost/weak_ptr.hpp Tue Jul 8 04:19:08 2003 ---- misc/build/spirit-1.6.1/miniboost/boost/weak_ptr.hpp Wed Dec 5 10:08:58 2007 -*************** -*** 16,26 **** - - #include <boost/shared_ptr.hpp> - -- #ifdef BOOST_MSVC // moved here to work around VC++ compiler crash -- # pragma warning(push) -- # pragma warning(disable:4284) // odd return type for operator-> -- #endif -- - namespace boost - { - ---- 16,21 ---- -*************** -*** 185,193 **** - } - - } // namespace boost -- -- #ifdef BOOST_MSVC -- # pragma warning(pop) -- #endif - - #endif // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED ---- 180,184 ---- diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 16dcb4fc0700..dd2300eaa8d1 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -41,7 +41,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE .IF "$(ENABLE_CAIRO)" == "" all: - @echo "Nothing to do (Cairo not enabled)." + @echo "Nothing to do (Cairo not enabled)." .ELIF "$(SYSTEM_CAIRO)" == "YES" all: @@ -60,6 +60,7 @@ cairo_CFLAGS=$(SOLARINC) cairo_LDFLAGS=$(SOLARLIB) cairo_CPPFLAGS= + .IF "$(SYSTEM_ZLIB)"!="YES" cairo_CPPFLAGS+=-I$(SOLARINCDIR)$/external$/zlib cairo_COMPRESS=z_compress @@ -103,9 +104,17 @@ OUT2INC+=src$/cairo-win32.h .ELIF "$(GUIBASE)"=="aqua" # ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- +.IF "$(SYSBASE)"!="" +.IF "$(EXTRA_CFLAGS)" != "" +cairo_CFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) +cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) +.ENDIF # "$(EXTRA_CFLAGS)" != "" +.ENDIF # "$(SYSBASE)"!="" CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --disable-png --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) +cairo_CPPFLAGS+=$(EXTRA_CDEFS) +cairo_LDFLAGS+=$(EXTRA_LINKFLAGS) BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 93ce36623222..c48f80c2da49 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -41,11 +41,11 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE .IF "$(ENABLE_CAIRO)" == "" all: - @echo "Nothing to do (Cairo not enabled)." + @echo "Nothing to do (Cairo not enabled)." .ELIF "$(BUILD_PIXMAN)" == "" all: - @echo "Not building pixman." + @echo "Not building pixman." .ENDIF @@ -81,7 +81,12 @@ BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 # ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no +CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)" +.IF "$(SYSBASE)"!="" +.IF "$(EXTRA_CFLAGS)"!="" +CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)" +.ENDIF # "$(EXTRA_CDEFS)"!="" +.ENDIF # "$(SYSBASE)"!="" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/curl/curl-7.12.2.patch b/curl/curl-7.12.2.patch index f65e4cd092bc..5aff45800b77 100644 --- a/curl/curl-7.12.2.patch +++ b/curl/curl-7.12.2.patch @@ -1057,29 +1057,14 @@ current="$number_major" revision="$number_minor" age="0" -@@ -2990,16 +2990,6 @@ - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" +@@ -2996,8 +2996,8 @@ ;; -- freebsd-aout) -- major=".$current" -- versuffix=".$current.$revision"; -- ;; -- -- freebsd-elf) + freebsd-elf) - major=".$current" - versuffix=".$current"; -- ;; -- - irix | nonstopux) - major=`expr $current - $age + 1` - -@@ -3022,7 +3012,7 @@ - versuffix="$major.$revision" ++ major=.`expr $current - $age` ++ versuffix="$major" ;; -- linux) -+ linux|freebsd-aout|freebsd-elf) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; + irix | nonstopux) diff --git a/graphite/graphite-2.3.1.patch.mingw b/graphite/graphite-2.3.1.patch.mingw new file mode 100644 index 000000000000..ecec00da7c6e --- /dev/null +++ b/graphite/graphite-2.3.1.patch.mingw @@ -0,0 +1,168 @@ +--- misc/silgraphite-2.3.1/engine/config/ltmain.sh 2009-01-28 11:21:59.000000000 +0900 ++++ misc/build/silgraphite-2.3.1/engine/config/ltmain.sh 2009-08-23 20:59:13.180125000 +0900 +@@ -3963,7 +3963,7 @@ + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) +- absdir=`cd "$dir" && pwd` ++ absdir=`cygpath -m -a "$dir"` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" +--- misc/silgraphite-2.3.1/engine/src/Makefile.in 2009-01-28 11:25:00.000000000 +0900 ++++ misc/build/silgraphite-2.3.1/engine/src/Makefile.in 2009-08-23 20:59:13.742625000 +0900 +@@ -62,7 +62,8 @@ + GrFSM.lo GrGlyphTable.lo GrPassActionCode.lo GrPass.lo \ + GrSlotState.lo GrSlotStream.lo GrTableManager.lo \ + MemoryUsage.lo Platform.lo SegmentAux.lo Segment.lo TestFSM.lo \ +- TestPasses.lo TransductionLog.lo SegmentPainter.lo ++ TestPasses.lo TransductionLog.lo SegmentPainter.lo WinFont.lo \ ++ WinSegmentPainter.lo + libgraphite_la_OBJECTS = $(am_libgraphite_la_OBJECTS) + libgraphite_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +@@ -257,11 +258,14 @@ + $(segmentdir)/Platform.cpp $(segmentdir)/SegmentAux.cpp \ + $(segmentdir)/Segment.cpp $(segmentdir)/TestFSM.cpp \ + $(segmentdir)/TestPasses.cpp $(segmentdir)/TransductionLog.cpp \ +- $(painterdir)/SegmentPainter.cpp ++ $(painterdir)/SegmentPainter.cpp \ ++ $(winwrapperdir)/WinFont.cpp \ ++ $(winwrapperdir)/WinSegmentPainter.cpp + genericdir = $(top_srcdir)/src/generic + fontdir = $(top_srcdir)/src/font + segmentdir = $(top_srcdir)/src/segment + painterdir = $(top_srcdir)/src/painter ++winwrapperdir = $(top_srcdir)/../wrappers/win32 + all: all-am + + .SUFFIXES: +@@ -358,6 +362,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TransductionLog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TtfUtil.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinFont.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinSegmentPainter.Plo@am__quote@ + + .cpp.o: + @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -569,6 +575,20 @@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SegmentPainter.lo `test -f '$(painterdir)/SegmentPainter.cpp' || echo '$(srcdir)/'`$(painterdir)/SegmentPainter.cpp + ++WinFont.lo: $(winwrapperdir)/WinFont.cpp ++@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT WinFont.lo -MD -MP -MF $(DEPDIR)/WinFont.Tpo -c -o WinFont.lo `test -f '$(winwrapperdir)/WinFont.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinFont.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/WinFont.Tpo $(DEPDIR)/WinFont.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(winwrapperdir)/WinFont.cpp' object='WinFont.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WinFont.lo `test -f '$(winwrapperdir)/WinFont.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinFont.cpp ++ ++WinSegmentPainter.lo: $(winwrapperdir)/WinSegmentPainter.cpp ++@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT WinSegmentPainter.lo -MD -MP -MF $(DEPDIR)/WinSegmentPainter.Tpo -c -o WinSegmentPainter.lo `test -f '$(winwrapperdir)/WinSegmentPainter.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinSegmentPainter.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/WinSegmentPainter.Tpo $(DEPDIR)/WinSegmentPainter.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(winwrapperdir)/WinSegmentPainter.cpp' object='WinSegmentPainter.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WinSegmentPainter.lo `test -f '$(winwrapperdir)/WinSegmentPainter.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinSegmentPainter.cpp ++ + mostlyclean-libtool: + -rm -f *.lo + +--- misc/silgraphite-2.3.1/engine/src/font/FileFont.cpp 2009-01-22 07:36:42.000000000 +0900 ++++ misc/build/silgraphite-2.3.1/engine/src/font/FileFont.cpp 2009-08-23 20:59:14.148875000 +0900 +@@ -208,7 +208,11 @@ + } + // } + #elif 1 ++#ifdef __MINGW32__ ++ m_stuFaceName.assign(reinterpret_cast<wchar_t*>(rgchwFace)); ++#else + m_stuFaceName.assign(rgchwFace); ++#endif + #else // VS 2005 needs this: + for (int cch16 = 0; cch16 < cchw; cch16++) + m_stuFaceName.push_back(rgchwFace[cch16]); +--- misc/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2009-01-22 07:36:42.000000000 +0900 ++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2009-08-23 20:59:15.445750000 +0900 +@@ -375,7 +375,7 @@ + _itow(dxDesiredWidth, rgchw, 10); + strTmp += rgchw; + strTmp += L")\n"; +- OutputDebugString(strTmp.c_str()); ++ OutputDebugStringW(strTmp.c_str()); + #else + Assert(fprintf(stderr, + "justification failed by %d units (width needed = %d)\n", +--- misc/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp 2009-01-22 07:36:42.000000000 +0900 ++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp 2009-08-23 20:59:15.711375000 +0900 +@@ -56,7 +56,7 @@ + + int main(int argc, char* argv[]) + { +-#ifdef _WIN32 ++#if defined(_WIN32) && !defined(__MINGW32__) + _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF); + #endif // WIN32 + +--- misc/silgraphite-2.3.1/engine/test/RegressionTest/main.h 2009-01-29 17:33:19.000000000 +0900 ++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/main.h 2009-08-23 20:59:15.945750000 +0900 +@@ -36,7 +36,7 @@ + ////#include <algorithm> + #include <string> + #include <cstring> +-#ifdef _WIN32 ++#if defined(_WIN32) && !defined(__MINGW32__) + #include <crtdbg.h> + #endif // _WIN32 + #include <assert.h> +--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-01-29 17:33:19.000000000 +0900 ++++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-08-23 20:59:16.211375000 +0900 +@@ -408,7 +408,7 @@ + if (pPolyCurve->wType == TT_PRIM_QSPLINE && + // test if this is the last curve + pPolyHdr->cb - (int)((byte *)(&pPolyCurve->apfx[j]) - (byte *)(pPolyHdr)) +- == sizeof POINTFX && ++ == sizeof(POINTFX) && + // and the two points are identical + CompareFixed(pPolyCurve->apfx[j].x, pPolyHdr->pfxStart.x) && + CompareFixed(pPolyCurve->apfx[j].y, pPolyHdr->pfxStart.y)) +@@ -846,7 +846,7 @@ + + } // namespace gr + +-template stdext::hash_map< ++template class stdext::hash_map< + gr::WinFont::LogFontWrapper, + gr::WinFont::FontHandleCache::FontCacheValue, + gr::WinFont::LogFontHashFuncs>; +--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h 2009-01-29 17:33:19.000000000 +0900 ++++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h 2009-08-23 20:59:16.367625000 +0900 +@@ -17,6 +17,9 @@ + #endif + #ifndef WINFONT_INCLUDED + #define WINFONT_INCLUDED ++#if __GNUC__ >=3 ++#pragma GCC system_header ++#endif + + //:End Ignore + +@@ -27,6 +30,8 @@ + #include "GrClient.h" + #include "Font.h" + ++namespace stdext = std; ++ + #ifdef _STLPORT_VERSION + namespace stdext = _STLP_STD; + #endif +--- misc/silgraphite-2.3.1/wrappers/win32/WinSegmentPainter.h 2008-05-09 20:10:30.000000000 +0900 ++++ misc/build/silgraphite-2.3.1/wrappers/win32/WinSegmentPainter.h 2009-08-23 21:14:38.961375000 +0900 +@@ -82,7 +82,7 @@ + // return ::SetBkColor(hdc, PALETTERGB(GetRValue(clr), GetGValue(clr), GetBValue(clr))); + //} + +- void WinSegmentPainter::paintAux(); ++ void paintAux(); + + protected: + // member variables: diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 8b673709a971..5faa9054f98a 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -123,6 +123,15 @@ GR_LIB_PATH=LD_LIBRARY_PATH=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) GR_LIB_PATH= .ENDIF +.IF "$(OS)"=="WNT" +PATCH_FILES+=graphite-2.3.1.patch.mingw +EXTRA_GR_CXX_FLAGS=-nostdinc +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +EXTRA_GR_CXX_FLAGS+=-shared-libgcc +.ENDIF +EXTRA_GR_LD_FLAGS+=-no-undefined +.ENDIF + # don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail # CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)' @@ -148,7 +157,7 @@ BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/libgraphite.*.dylib .ELSE -.IF "$(OS)"=="WNT" +.IF "$(OS)"=="WNT" && "$(COM)"!="GCC" #OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll .IF "$(debug)"=="true" OUT2BIN= \ diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index db667cc038d2..f7e17c9dad0c 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -62,8 +62,10 @@ CONFIGURE_FLAGS+= CFLAGS=-xc99=none .IF "$(SYSBASE)"!="" .IF "$(EXTRA_CFLAGS)"!="" CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)" -.ENDIF # "$(SYSBASE)"!="" .ENDIF # "$(EXTRA_CFLAGS)"!="" +.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +.ENDIF BUILD_ACTION=make && make check diff --git a/icu/makefile.mk b/icu/makefile.mk index 71e2c911fc80..7503a4c18dbc 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -86,6 +86,7 @@ icu_LDFLAGS+=-Wl,-z,noexecstack .ENDIF icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) +icu_LDFLAGS+=$(EXTRA_LINKFLAGS) icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) BUILD_ACTION_SEP=; diff --git a/libxml2/libxml2-2.6.31-mingw.patch b/libxml2/libxml2-2.6.31-mingw.patch index 102ef3e2dbb2..412db5bc244a 100644 --- a/libxml2/libxml2-2.6.31-mingw.patch +++ b/libxml2/libxml2-2.6.31-mingw.patch @@ -1,3 +1,14 @@ +--- misc/libxml2-2.6.31/configure 2008-01-11 17:01:56.000000000 +0900 ++++ misc/build/libxml2-2.6.31/configure 2009-09-07 20:48:47.656250000 +0900 +@@ -27331,6 +27331,8 @@ + + if test "$with_modules" != "no" ; then + case "$host" in ++ *-*-mingw*) ++ ;; + *-*-cygwin*) + MODULE_EXTENSION=".dll" + { echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5 --- misc/libxml2-2.6.31/libxml.h 2007-11-23 19:47:23.000000000 +0900 +++ misc/build/libxml2-2.6.31/libxml.h 2009-07-10 14:37:34.988250000 +0900 @@ -30,6 +30,10 @@ diff --git a/libxml2/libxml2-2.6.31.patch b/libxml2/libxml2-2.6.31.patch index cba8f23e9663..31fcf72e8479 100644 --- a/libxml2/libxml2-2.6.31.patch +++ b/libxml2/libxml2-2.6.31.patch @@ -165,7 +165,7 @@ ;; --libs) -! echo -L${libdir} ${LIBXML2LIB} ${ZLIB3RDLIB} -lm +! echo -L${libdir} ${LIBXML2LIB} -lm ! # if [ "`uname`" = "Linux" ] ! # then ! # if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index b99c52f6aa88..a9c2336b16cc 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -70,7 +70,7 @@ xml2_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump" BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ELSE @@ -99,10 +99,10 @@ xml2_LDFLAGS+=-Wl,-z,noexecstack CONFIGURE_DIR= .IF "$(OS)"=="OS2" CONFIGURE_ACTION=sh .$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" .ELSE CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" .ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) diff --git a/libxml2/prj/build.lst b/libxml2/prj/build.lst index 16c0b0d5e0b0..01d9b3fdee1b 100644 --- a/libxml2/prj/build.lst +++ b/libxml2/prj/build.lst @@ -1,3 +1,3 @@ -lx libxml2 : soltools ZLIB:zlib NULL +lx libxml2 : soltools NULL lx libxml2 usr1 - all lx_mkout NULL lx libxml2 nmake - all lx_libxml2 NULL diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index ba335eed7e19..4569a1810724 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -46,6 +46,8 @@ all: # --- Files -------------------------------------------------------- +.IF "$(L10N_framework)"=="" + .INCLUDE : libxsltversion.mk LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO) @@ -54,7 +56,6 @@ TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION) PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch # This is only for UNX environment now - .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" xslt_CC=$(CC) @@ -103,7 +104,6 @@ LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -l .EXPORT: CPPFLAGS .EXPORT: LDFLAGS .EXPORT: LIBXML2LIB -.EXPORT: ZLIB3RDLIB .IF "$(COMNAME)"=="sunpro5" CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none @@ -144,7 +144,7 @@ OUT2BIN+=xslt-config .ENDIF # --- Targets ------------------------------------------------------ - +.ENDIF # L10N_framework .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index 654cbc8d05e0..dfb14afa8a3e 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -30,7 +30,7 @@ #************************************************************************* MOZTARGET=$(OS)$(COM)$(CPU) -MOZ_DIST_DIR=$(MISC)$/build$/mozilla$/dist +MOZ_DIST_DIR=$(MISC)$/build$/mozilla$/$(BUILD_DIR)$/dist MOZ_BIN_DIR=$(MOZ_DIST_DIR)$/bin RUNTIME_DIR=$(MISC)$/$(MOZTARGET)runtime LIB_DIR=$(LB) diff --git a/moz/makefile.mk b/moz/makefile.mk index 75be11886f66..3722229bf74d 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -160,9 +160,13 @@ DEFAULT_MOZILLA_TOOLKIT*=gtk2 MOZILLA_CONFIGURE_FLAGS+= --enable-default-toolkit=$(DEFAULT_MOZILLA_TOOLKIT) .ENDIF -CONFIGURE_ACTION=sh -c "./configure $(MOZILLA_CONFIGURE_FLAGS)" +# create a objdir build = build files in a seperate directory, not in the sourcetree directly +CONFIGURE_DIR=$(CPU)_objdir +BUILD_DIR=$(CONFIGURE_DIR) +MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="gcc -arch $(MOZ_ARCH)" CXX="g++ -arch $(MOZ_ARCH)" AR=ar + +CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS) -BUILD_DIR= .IF "$(USE_SHELL)"!="4nt" BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS) .ELSE @@ -332,4 +336,94 @@ $(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack zip: \ $(MISC)$/CREATETARBALL +.IF "$(GUIBASE)"=="aqua" +MOZ_ARCH=$(eq,$(CPU),I i386 ppc) +MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8) + +force_clean : + @$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI) + +zip_intel .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL + +zip_ppc .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL + +# target-conditionals, when building target -> Macro is set +zip_intel ?= MOZ_ARCH=i386 +zip_intel ?= MOZILLA_CONFIGURE_FLAGS+=--target=i386-apple-darwin8 +zip_intel ?= CPU=I + +zip_ppc ?= MOZ_ARCH=ppc +zip_ppc ?= MOZILLA_CONFIGURE_FLAGS+=--target=powerpc-apple-darwin8 +zip_ppc ?= CPU=P + +zip_universal: $(OUT)$/zipped$/$(OS)$(COM)UBinc.zip $(OUT)$/zipped$/$(OS)$(COM)UBlib.zip $(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip + @echo "All zips created successfully - copy from $(OUT)$/zipped to \$$SRC_ROOT/moz/zipped and use --disable-build-mozilla to use them" + +$(OUT)$/zipped$/$(OS)$(COM)UBinc.zip : zipped$/$(OS)$(COM)Pinc.zip zipped$/$(OS)$(COM)Iinc.zip + @echo "setting up for $@" + @rm -rf $(MISC)$/UB_inc + @$(MKDIRHIER) $(MISC)$/UB_inc$/intel + @$(MKDIR) $(MISC)$/UB_inc$/ppc + @$(MKDIR) $(MISC)$/UB_inc$/uni + @unzip -q zipped$/$(OS)$(COM)Pinc.zip -d $(MISC)$/UB_inc$/ppc + @unzip -q zipped$/$(OS)$(COM)Iinc.zip -d $(MISC)$/UB_inc$/intel +# use one of the two as basis for the universal one - (saves manually creating directories/copying identical files) + @unzip -q zipped$/$(OS)$(COM)Pinc.zip -d $(MISC)$/UB_inc$/uni +# add safety-warning to host-autogenerated headers (aren't used anywhere in OOo currently, but doesn't hurt to be safe +# bail out on everything that differs and is not a *.h file + @echo "flagging endian-specific headers with #error.." + @diff --brief -r $(MISC)$/UB_inc$/ppc $(MISC)$/UB_inc$/intel | awk \ + '/^Only in/ {{print; print "ERROR - file sets differ!"; exit 1}} \ + /^Files .*\.h differ$$/ {{target="$(MISC)$/UB_inc$/uni$/" substr($$2,length("$(MISC)$/UB_inc$/ppc")+2); \ + system("echo \"#error use native moz-zips, this header is endian-specific!\" | cat - " $$2 " > " target); next}} \ + {{print; print "ERROR - unexpected files encountered!"; exit 2}}' + @cd $(MISC)$/UB_inc$/uni ; zip -q -r ..$/$(@:f) * + @$(MKDIRHIER) $(@:d) + @$(MV) $(MISC)$/UB_inc$/$(@:f) $@ + @echo "successfully created $@" + +$(OUT)$/zipped$/$(OS)$(COM)UBlib.zip : zipped$/$(OS)$(COM)Plib.zip zipped$/$(OS)$(COM)Ilib.zip + @echo "setting up for $@" + @rm -rf $(MISC)$/UB_lib + @$(MKDIRHIER) $(MISC)$/UB_lib$/intel + @$(MKDIR) $(MISC)$/UB_lib$/ppc + @$(MKDIR) $(MISC)$/UB_lib$/uni + @unzip -q zipped$/$(OS)$(COM)Plib.zip -d $(MISC)$/UB_lib$/ppc + @unzip -q zipped$/$(OS)$(COM)Ilib.zip -d $(MISC)$/UB_lib$/intel +# use lipo on .a and .dylib files - bail out on anything else + @echo "creating universal binaries from libs..." + @diff --brief -s -r $(MISC)$/UB_lib$/ppc $(MISC)$/UB_lib$/intel | awk \ + '/^Only in/ {{print "ERROR - file sets differ!"; print; exit 1}} \ + /^Files .*\.(a|dylib) differ$$/ {{target="$(MISC)$/UB_lib$/uni$/" substr($$2,length("$(MISC)$/UB_lib$/ppc")+2); \ + if(0!=system("lipo -create -arch ppc "$$2" -arch i386 "$$4" -output " target)) exit 11; next}} \ + {{print; print "ERROR - unexpected files encountered!"; exit 2}}' + @cd $(MISC)$/UB_lib$/uni ; zip -q -r ..$/$(@:f) * + @$(MKDIRHIER) $(@:d) + @$(MV) $(MISC)$/UB_lib$/$(@:f) $@ + @echo "successfully created $@" + +$(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip : zipped$/$(OS)$(COM)Pruntime.zip zipped$/$(OS)$(COM)Iruntime.zip + @echo "setting up for $@" + @rm -rf $(MISC)$/UB_runtime + @$(MKDIRHIER) $(MISC)$/UB_runtime$/intel + @$(MKDIR) $(MISC)$/UB_runtime$/ppc + @$(MKDIR) $(MISC)$/UB_runtime$/uni + @unzip -q zipped$/$(OS)$(COM)Pruntime.zip -d $(MISC)$/UB_runtime$/ppc + @unzip -q zipped$/$(OS)$(COM)Iruntime.zip -d $(MISC)$/UB_runtime$/intel +# use one of the two as basis for the universal one - (saves manually creating directories/copying identical files) + @unzip -q zipped$/$(OS)$(COM)Pruntime.zip -d $(MISC)$/UB_runtime$/uni +# @line -comments in autogenerated files: contains path of source-file, ignore different objdirs + @echo "creating universal binaries from libs..." + @diff --brief -I "^//@line [0-9][0-9]*" -r $(MISC)$/UB_runtime$/ppc $(MISC)$/UB_runtime$/intel | awk \ + '/^Only in/ {{print; print "ERROR - file sets differ!"; exit 1}} \ + /^Files .*\.dylib differ$$/ {{target="$(MISC)$/UB_runtime$/uni$/" substr($$2,length("$(MISC)$/UB_runtime$/ppc")+2); \ + if(0!=system("lipo -create -arch ppc "$$2" -arch i386 "$$4" -output " target)) exit 11; next}} \ + {{print; print "ERROR - unexpected files encountered!"; exit 2}}' + @cd $(MISC)$/UB_lib$/uni ; zip -q -r ..$/$(@:f) * + @$(MKDIRHIER) $(@:d) + @$(MV) $(MISC)$/UB_lib$/$(@:f) $@ + @echo "successfully created $@" + +.ENDIF # $(GUIBASE)=="aqua" + .INCLUDE : extractfiles.mk diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index 400b5767759c..a7b3ea846e9b 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -60,11 +60,11 @@ ALLTAR: \ .ENDIF .IF "$(GUI)" == "UNX" -$(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip $(OS)$(COM)$(CPU)runtime.zip +$(MISC)$/unpacked_%_lib : $(OS)$(COM)$(CPU)lib.zip '$(OS)$(COM)$(CPU)runtime.zip' unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip && $(TOUCH) $@ chmod -R 775 $(LB) -$(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip +$(MISC)$/unpacked_%_inc : $(OS)$(COM)$(CPU)inc.zip unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@ chmod -R 775 $(INCCOM) @@ -79,14 +79,28 @@ $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip .ENDIF -$(BIN)$/mozruntime.zip : $(OS)$(COM)$(CPU)runtime.zip +$(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip $(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip +# add alternative rules for universal binary moz-zips +.IF "$(GUIBASE)" == "aqua" +$(MISC)$/unpacked_%_lib : $(OS)$(COM)UBlib.zip '$(OS)$(COM)UBruntime.zip' + unzip -o -d $(LB) $(OS)$(COM)UBlib.zip && unzip -o -d $(LB) $(OS)$(COM)UBruntime.zip && $(TOUCH) $@ + chmod -R 775 $(LB) + +$(MISC)$/unpacked_%_inc : $(OS)$(COM)UBinc.zip + unzip -o -d $(INCCOM) $(OS)$(COM)UBinc.zip && $(TOUCH) $@ + chmod -R 775 $(INCCOM) + +$(BIN)$/mozruntime%zip : $(OS)$(COM)UBruntime.zip + $(COPY) $(OS)$(COM)UBruntime.zip $(BIN)$/mozruntime.zip + +.ENDIF # "$(GUIBASE)"=="aqua" + LIBLIST = BIN_RUNTIMELIST = NSS_INCLUDE_LIST = NSS_MODULE_RUNTIME_LIST = - .IF "$(ENABLE_NSS_MODULE)"=="YES" # The prebuilt moz files include all the old NSS stuff from moz and not the new # NSS libs, headers, etc, from the separate nss module. If we use the nss module diff --git a/neon/neon.patch b/neon/neon.patch index b9776097ecbb..569ed0f0a189 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -1,5 +1,5 @@ ---- misc/neon-0.28.2/src/config.h 2009-06-24 12:49:38.000000000 +0200 -+++ misc/build/neon-0.28.2/src/config.h 2009-06-24 12:46:45.000000000 +0200 +--- misc/neon-0.28.2/src/config.h 2009-08-30 19:00:56.000000000 +0200 ++++ misc/build/neon-0.28.2/src/config.h 2009-08-11 09:48:54.000000000 +0200 @@ -1 +1,484 @@ -dummy + @@ -486,8 +486,8 @@ +#else +#define HAVE_NTLM 1 +#endif ---- misc/neon-0.28.2/src/makefile.mk 2009-06-24 12:49:38.000000000 +0200 -+++ misc/build/neon-0.28.2/src/makefile.mk 2009-06-24 12:46:45.000000000 +0200 +--- misc/neon-0.28.2/src/makefile.mk 2009-08-30 19:00:56.000000000 +0200 ++++ misc/build/neon-0.28.2/src/makefile.mk 2009-08-11 09:48:54.000000000 +0200 @@ -1 +1,59 @@ -dummy +PRJ=..$/..$/..$/..$/.. @@ -550,7 +550,7 @@ + +.INCLUDE : target.mk --- misc/neon-0.28.2/src/ne_auth.c 2008-02-29 17:30:12.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_auth.c 2009-06-24 12:46:45.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_auth.c 2009-08-24 15:41:32.000000000 +0200 @@ -77,6 +77,10 @@ #include "ne_sspi.h" #endif @@ -585,6 +585,15 @@ } /* Returns client nonce string. */ +@@ -351,7 +364,7 @@ + static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt, + struct auth_challenge *chall, char *pwbuf) + { +- if (chall->handler->creds(chall->handler->userdata, sess->realm, ++ if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm, + chall->handler->attempt++, sess->username, pwbuf) == 0) { + return 0; + } else { @@ -598,9 +611,10 @@ int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0; int status; @@ -704,8 +713,21 @@ return ret; } +--- misc/neon-0.28.2/src/ne_auth.h 2007-12-05 17:39:58.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_auth.h 2009-08-24 15:16:22.000000000 +0200 +@@ -47,8 +47,8 @@ + * Hint: if you just wish to attempt authentication just once (even if + * the user gets the username/password wrong), have the callback + * function use 'attempt' value as the function return value. */ +-typedef int (*ne_auth_creds)(void *userdata, const char *realm, int attempt, +- char *username, char *password); ++typedef int (*ne_auth_creds)(void *userdata, const char * auth_protocol, ++ const char *realm, int attempt, char *username, char *password); + + /* Set callbacks to provide credentials for server and proxy + * authentication, using the default set of authentication protocols. --- misc/neon-0.28.2/src/ne_defs.h 2006-10-24 21:40:09.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_defs.h 2009-06-24 12:46:45.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_defs.h 2009-08-11 09:48:54.000000000 +0200 @@ -41,7 +41,7 @@ #endif @@ -716,7 +738,7 @@ #endif --- misc/neon-0.28.2/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_locks.h 2009-06-24 12:46:45.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_locks.h 2009-08-11 09:48:54.000000000 +0200 @@ -22,6 +22,10 @@ #ifndef NE_LOCKS_H #define NE_LOCKS_H @@ -728,8 +750,8 @@ #include "ne_request.h" /* for ne_session + ne_request */ #include "ne_uri.h" /* for ne_uri */ ---- misc/neon-0.28.2/src/ne_ntlm.c 2009-06-24 12:49:38.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_ntlm.c 2009-06-24 12:46:45.000000000 +0200 +--- misc/neon-0.28.2/src/ne_ntlm.c 2009-08-30 19:00:56.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_ntlm.c 2009-08-11 09:48:54.000000000 +0200 @@ -1 +1,700 @@ -dummy +/* @@ -1432,8 +1454,8 @@ + +#endif /* HAVE_OPENSSL */ +#endif /* HAVE_NTLM */ ---- misc/neon-0.28.2/src/ne_ntlm.h 2009-06-24 12:49:38.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_ntlm.h 2009-06-24 12:46:45.000000000 +0200 +--- misc/neon-0.28.2/src/ne_ntlm.h 2009-08-30 19:00:56.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_ntlm.h 2009-08-11 09:48:54.000000000 +0200 @@ -1 +1,44 @@ -dummy +/* @@ -1481,7 +1503,7 @@ + +#endif /* NE_NTLM_H */ --- misc/neon-0.28.2/src/ne_socket.c 2008-02-28 14:19:19.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_socket.c 2009-06-24 12:49:13.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_socket.c 2009-08-11 09:48:54.000000000 +0200 @@ -60,6 +60,7 @@ #include <stddef.h> #ifdef USE_GETADDRINFO @@ -1491,7 +1513,7 @@ #endif --- misc/neon-0.28.2/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-06-24 12:46:45.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-08-11 09:48:54.000000000 +0200 @@ -202,9 +202,48 @@ return -1; } @@ -1582,7 +1604,7 @@ securityStatus = initializeSecurityContext(&sspiContext->credentials, NULL, --- misc/neon-0.28.2/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_sspi.h 2009-06-24 12:46:45.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_sspi.h 2009-08-11 09:48:54.000000000 +0200 @@ -41,7 +41,7 @@ int ne_sspi_clear_context(void *context); @@ -1593,7 +1615,7 @@ #endif /* HAVE_SSPI */ --- misc/neon-0.28.2/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_uri.c 2009-06-24 12:46:45.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_uri.c 2009-08-11 09:48:54.000000000 +0200 @@ -42,7 +42,7 @@ #include "ne_alloc.h" #include "ne_uri.h" @@ -1639,3 +1661,44 @@ /* 3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU, /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US, +--- misc/neon-0.28.2/src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_utils.c 2009-08-30 18:55:04.000000000 +0200 +@@ -118,6 +118,9 @@ + #ifdef HAVE_GNUTLS + ", GNU TLS " LIBGNUTLS_VERSION + #endif /* HAVE_GNUTLS */ ++#ifdef HAVE_SSPI ++ ", SSPI" ++#endif /* HAVE_SSPI */ + "." + ; + +@@ -137,7 +140,7 @@ + switch (feature) { + #if defined(NE_HAVE_SSL) || defined(NE_HAVE_ZLIB) || defined(NE_HAVE_IPV6) \ + || defined(NE_HAVE_SOCKS) || defined(NE_HAVE_LFS) \ +- || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) ++ || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) || defined(HAVE_SSPI) + #ifdef NE_HAVE_SSL + case NE_FEATURE_SSL: + #endif +@@ -159,6 +162,9 @@ + #ifdef NE_HAVE_I18N + case NE_FEATURE_I18N: + #endif ++#ifdef HAVE_SSPI ++ case NE_FEATURE_SSPI: ++#endif + return 1; + #endif /* NE_HAVE_* */ + default: +--- misc/neon-0.28.2/src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_utils.h 2009-08-24 15:47:03.000000000 +0200 +@@ -54,6 +54,7 @@ + #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */ + #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */ + #define NE_FEATURE_I18N (7) /* i18n error message support */ ++#define NE_FEATURE_SSPI (8) /* NTLM/Negotiate authentication protocol via SSPI */ + + /* Returns non-zero if library is built with support for the given + * NE_FEATURE_* feature code 'code'. */ diff --git a/neon/version.mk b/neon/version.mk index 4c044d2c2fe8..c5c6d6cc47f5 100644 --- a/neon/version.mk +++ b/neon/version.mk @@ -32,9 +32,9 @@ # the major NEON_MAJOR=0 # the minor -NEON_MINOR=26 +NEON_MINOR=28 # the micro -NEON_MICRO=3 +NEON_MICRO=2 # concat NEON_VERSION=$(NEON_MAJOR)$(NEON_MINOR)$(NEON_MICRO) diff --git a/nss/makefile.mk b/nss/makefile.mk index 06881d3359d6..2d2d44336c71 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -109,7 +109,7 @@ nss_LIBS+=-lstdc++_s BUILD_DIR=security$/nss -BUILD_ACTION=NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH=$(PATH) DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all +BUILD_ACTION=NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all OUT2LIB= \ dist$/out$/lib$/libnspr4.a \ |