Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r50048 - in sandbox/compile-in-place/Boost_1_35_0/boost: filesystem iostreams/detail/config program_options regex serialization signals/detail system thread/detail wave
From: doomster_at_[hidden]
Date: 2008-12-01 02:23:58


Author: eckhardt
Date: 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
New Revision: 50048
URL: http://svn.boost.org/trac/boost/changeset/50048

Log:
- Change configuration code so that it will treat the in-place compiled variant
 like static linking except that it also doesn't autolink any lib.

Text files modified:
   sandbox/compile-in-place/Boost_1_35_0/boost/filesystem/config.hpp | 3 ++-
   sandbox/compile-in-place/Boost_1_35_0/boost/iostreams/detail/config/auto_link.hpp | 4 +++-
   sandbox/compile-in-place/Boost_1_35_0/boost/program_options/config.hpp | 3 ++-
   sandbox/compile-in-place/Boost_1_35_0/boost/regex/config.hpp | 4 +++-
   sandbox/compile-in-place/Boost_1_35_0/boost/serialization/config.hpp | 1 +
   sandbox/compile-in-place/Boost_1_35_0/boost/signals/detail/config.hpp | 4 +++-
   sandbox/compile-in-place/Boost_1_35_0/boost/system/config.hpp | 4 +++-
   sandbox/compile-in-place/Boost_1_35_0/boost/thread/detail/config.hpp | 4 +++-
   sandbox/compile-in-place/Boost_1_35_0/boost/wave/wave_config.hpp | 5 +++--
   9 files changed, 23 insertions(+), 9 deletions(-)

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/filesystem/config.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/filesystem/config.hpp (original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/filesystem/config.hpp 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
@@ -92,7 +92,8 @@
 
 // enable automatic library variant selection ------------------------------//
 
-#if !defined(BOOST_FILESYSTEM_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_FILESYSTEM_NO_LIB)
+#if !defined(BOOST_FILESYSTEM_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_FILESYSTEM_NO_LIB)\
+ && !defined(BOOST_ALL_COMPILE_IN_PLACE) && !defined(BOOST_FILESYSTEM_COMPILE_IN_PLACE)
 //
 // Set the name of our library, this will get undef'ed by auto_link.hpp
 // once it's done with it:

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/iostreams/detail/config/auto_link.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/iostreams/detail/config/auto_link.hpp (original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/iostreams/detail/config/auto_link.hpp 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
@@ -30,7 +30,9 @@
 
 #if !defined(BOOST_IOSTREAMS_SOURCE) && \
     !defined(BOOST_ALL_NO_LIB) && \
- !defined(BOOST_IOSTREAMS_NO_LIB) \
+ !defined(BOOST_IOSTREAMS_NO_LIB) && \
+ !defined(BOOST_ALL_COMPILE_IN_PLACE) && \
+ !defined(BOOST_IOSTREAMS_COMPILE_IN_PLACE) \
     /**/
 
 // Set the name of our library, this will get undef'ed by auto_link.hpp

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/program_options/config.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/program_options/config.hpp (original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/program_options/config.hpp 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
@@ -16,7 +16,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // enable automatic library variant selection
 #if !defined(BOOST_PROGRAM_OPTIONS_SOURCE) && !defined(BOOST_ALL_NO_LIB) && \
- !defined(BOOST_PROGRAM_OPTIONS_NO_LIB)
+ !defined(BOOST_PROGRAM_OPTIONS_NO_LIB) && \
+ !defined(BOOST_ALL_COMPILE_IN_PLACE) && !defined(BOOST_PROGRAM_OPTIONS_COMPILE_IN_PLACE)
 
 // Set the name of our library, this will get undef'ed by auto_link.hpp
 // once it's done with it:

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/regex/config.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/regex/config.hpp (original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/regex/config.hpp 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
@@ -193,7 +193,9 @@
 # define BOOST_REGEX_DECL
 #endif
 
-#if !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_REGEX_SOURCE) && !defined(BOOST_ALL_NO_LIB) && defined(__cplusplus)
+#if !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_ALL_NO_LIB) && \
+ !defined(BOOST_REGEX_COMPILE_IN_PLACE) && !defined(BOOST_ALL_COMPILE_IN_PLACE) && \
+ !defined(BOOST_REGEX_SOURCE) && defined(__cplusplus)
 # define BOOST_LIB_NAME boost_regex
 # if defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)
 # define BOOST_DYN_LINK

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/serialization/config.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/serialization/config.hpp (original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/serialization/config.hpp 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
@@ -55,6 +55,7 @@
 // enable automatic library variant selection ------------------------------//
 
 #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SERIALIZATION_NO_LIB) \
+&& !defined(BOOST_ALL_COMPILE_IN_PLACE) && !defined(BOOST_SERIALIZATION_COMPILE_IN_PLACE) \
 && !defined(BOOST_SERIALIZATION_SOURCE) \
 && !defined(BOOST_ARCHIVE_SOURCE) && !defined(BOOST_WARCHIVE_SOURCE)
 //

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/signals/detail/config.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/signals/detail/config.hpp (original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/signals/detail/config.hpp 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
@@ -32,7 +32,9 @@
 #endif
 
 // Setup autolinking
-#if !defined(BOOST_SIGNALS_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SIGNALS_NO_LIB)
+#if !defined(BOOST_SIGNALS_SOURCE) && \
+ !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SIGNALS_NO_LIB) && \
+ !defined(BOOST_ALL_COMPILE_IN_PLACE) && !defined(BOOST_SIGNALS_COMPILE_IN_PLACE)
 # define BOOST_LIB_NAME boost_signals
 
 # if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SIGNALS_DYN_LINK)

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/system/config.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/system/config.hpp (original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/system/config.hpp 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
@@ -53,7 +53,9 @@
 
 // enable automatic library variant selection ------------------------------//
 
-#if !defined(BOOST_SYSTEM_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SYSTEM_NO_LIB)
+#if !defined(BOOST_SYSTEM_SOURCE) && \
+ !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SYSTEM_NO_LIB) && \
+ !defined(BOOST_ALL_COMPILE_IN_PLACE) && !defined(BOOST_SYSTEM_COMPILE_IN_PLACE)
 //
 // Set the name of our library, this will get undef'ed by auto_link.hpp
 // once it's done with it:

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/thread/detail/config.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/thread/detail/config.hpp (original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/thread/detail/config.hpp 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
@@ -60,7 +60,9 @@
 //
 // Automatically link to the correct build variant where possible.
 //
-#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_THREAD_NO_LIB) && !defined(BOOST_THREAD_BUILD_DLL) && !defined(BOOST_THREAD_BUILD_LIB)
+#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_THREAD_NO_LIB) && \
+ !defined(BOSST_ALL_COMPILE_IN_PLACE) && !defined(BOOST_THREAD_COMPILE_IN_PLACE) && \
+ !defined(BOOST_THREAD_BUILD_DLL) && !defined(BOOST_THREAD_BUILD_LIB)
 //
 // Tell the autolink to link dynamically, this will get undef'ed by auto_link.hpp
 // once it's done with it:

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/wave/wave_config.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/wave/wave_config.hpp (original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/wave/wave_config.hpp 2008-12-01 02:23:57 EST (Mon, 01 Dec 2008)
@@ -445,8 +445,9 @@
 // Auto library naming
 #if BOOST_VERSION >= 103100
 // auto link features work beginning from Boost V1.31.0
-#if !defined(BOOST_WAVE_SOURCE) && !defined(BOOST_ALL_NO_LIB) && \
- !defined(BOOST_WAVE_NO_LIB)
+#if !defined(BOOST_WAVE_SOURCE) && \
+ !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_WAVE_NO_LIB) && \
+ !defined(BOOST_ALL_COMPILE_IN_PLACE) && !defined(BOOST_WAVE_COMPILE_IN_PLACE)
 
 #define BOOST_LIB_NAME boost_wave
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk