[Boost-commit] svn:boost r58028 - in trunk/libs/filesystem: build example test

Subject: [Boost-commit] svn:boost r58028 - in trunk/libs/filesystem: build example test
From: ghost_at_[hidden]
Date: 2009-11-29 05:03:35

Author: vladimir_prus
Date: 2009-11-29 05:03:34 EST (Sun, 29 Nov 2009)
New Revision: 58028
URL: http://svn.boost.org/trac/boost/changeset/58028

Log:
Fix Boost.Filesystem->Boost.System dependency for windows/shared.

Text files modified: 
   trunk/libs/filesystem/build/Jamfile.v2   |    16 +++++++++-------                        
   trunk/libs/filesystem/example/Jamfile.v2 |     1 -                                       
   trunk/libs/filesystem/test/Jamfile.v2    |     4 ++--                                    
   3 files changed, 11 insertions(+), 10 deletions(-)

Modified: trunk/libs/filesystem/build/Jamfile.v2
==============================================================================
--- trunk/libs/filesystem/build/Jamfile.v2	(original)
+++ trunk/libs/filesystem/build/Jamfile.v2	2009-11-29 05:03:34 EST (Sun, 29 Nov 2009)
@@ -19,14 +19,16 @@
     operations path portability utf8_codecvt_facet ;
 
 lib boost_filesystem
+    : $(SOURCES).cpp ../../system/build//boost_system
+    : <link>shared:<define>BOOST_ALL_DYN_LINK=1 # tell source we're building dll's
+      <link>static:<define>BOOST_All_STATIC_LINK=1 # tell source we're building static lib's
     :
-    $(SOURCES).cpp
-    ../../system/build//boost_system
-    :
-    <link>shared:<define>BOOST_ALL_DYN_LINK=1 # tell source we're building dll's
-    <link>static:<define>BOOST_All_STATIC_LINK=1 # tell source we're building static lib's
-    :
-    :
+    : # Boost.Filesystem uses some of Boost.System function in inlined/templated
+      # function, so clients that use Boost.Filesystem will have 
+      # direct refenreces to Boost.System systems. On Windows, this means those
+      # clients have to be directly linked to Boost.System. For static linking 
+      # this happens anyway, and for shared we need to make it happen.
+      <target-os>windows,<link>shared:<library>../../system/build//boost_system
     ;
 
 boost-install boost_filesystem ;
\ No newline at end of file

Modified: trunk/libs/filesystem/example/Jamfile.v2
==============================================================================
--- trunk/libs/filesystem/example/Jamfile.v2	(original)
+++ trunk/libs/filesystem/example/Jamfile.v2	2009-11-29 05:03:34 EST (Sun, 29 Nov 2009)
@@ -9,7 +9,6 @@
 
 project
     : requirements <library>../build//boost_filesystem
-      <library>/boost/system//boost_system
       <hardcode-dll-paths>true
     ;
     

Modified: trunk/libs/filesystem/test/Jamfile.v2
==============================================================================
--- trunk/libs/filesystem/test/Jamfile.v2	(original)
+++ trunk/libs/filesystem/test/Jamfile.v2	2009-11-29 05:03:34 EST (Sun, 29 Nov 2009)
@@ -14,13 +14,13 @@
        [ run path_test.cpp
          :  :  : <link>static
        ]                  
-       [ run path_test.cpp ../../system/build
+       [ run path_test.cpp
          :  :  :  : path_test_dll
        ]
        [ run operations_test.cpp
          :  :  : <link>static
        ]
-       [ run operations_test.cpp ../../system/build
+       [ run operations_test.cpp
          :  :  :  : operations_test_dll
        ]
        [ run fstream_test.cpp