[Boost-commit] svn:boost r85889 - in branches/modular-build: . libs/geometry/index/example libs/numeric/odeint/examples/vexcl libs/parameter/doc libs/parameter/doc/html libs/python/example libs/python/example/quickstart libs/python/example/tutorial libs/signals2/example libs/spirit/example/qi/json/build libs/units/test tools tools/regression/build

Subject: [Boost-commit] svn:boost r85889 - in branches/modular-build: . libs/geometry/index/example libs/numeric/odeint/examples/vexcl libs/parameter/doc libs/parameter/doc/html libs/python/example libs/python/example/quickstart libs/python/example/tutorial libs/signals2/example libs/spirit/example/qi/json/build libs/units/test tools tools/regression/build
From: ghost_at_[hidden]
Date: 2013-09-25 04:35:32

Author: vladimir_prus
Date: 2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)
New Revision: 85889
URL: http://svn.boost.org/trac/boost/changeset/85889

Log:
Modularization patch from Bjorn

Text files modified: 
   branches/modular-build/Jamroot                                       |    26 +++++++++++++++++++++++++-              
   branches/modular-build/libs/geometry/index/example/Jamfile.v2        |     2 +-                                      
   branches/modular-build/libs/numeric/odeint/examples/vexcl/Jamfile.v2 |     2 +-                                      
   branches/modular-build/libs/parameter/doc/html/index.html            |     2 +-                                      
   branches/modular-build/libs/parameter/doc/index.rst                  |     2 +-                                      
   branches/modular-build/libs/python/example/Jamroot                   |     5 ++++-                                   
   branches/modular-build/libs/python/example/quickstart/Jamroot        |     2 ++                                      
   branches/modular-build/libs/python/example/tutorial/Jamroot          |     5 ++++-                                   
   branches/modular-build/libs/signals2/example/Jamfile.v2              |     2 +-                                      
   branches/modular-build/libs/spirit/example/qi/json/build/Jamfile     |     4 ++--                                    
   branches/modular-build/libs/units/test/Jamfile.v2                    |     2 +-                                      
   branches/modular-build/tools/Jamfile.v2                              |     3 +++                                     
   branches/modular-build/tools/regression/build/Jamroot.jam            |    10 +++++-----                              
   13 files changed, 51 insertions(+), 16 deletions(-)

Modified: branches/modular-build/Jamroot
==============================================================================
--- branches/modular-build/Jamroot	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/Jamroot	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -128,6 +128,7 @@
 import xsltproc ;
 import set ;
 import path ;
+import link ;
 
 path-constant BOOST_ROOT : . ;
 constant BOOST_VERSION : 1.55.0 ;
@@ -135,6 +136,29 @@
 
 boostcpp.set-version $(BOOST_VERSION) ;
 
+	
+local all-headers =
+    [ MATCH .*libs/(.*)/include/boost : [ glob libs/*/include/boost ] ] ;
+
+for dir in $(all-headers)
+{
+    link-directory $(dir)-headers : libs/$(dir)/include/boost : <location>. ;
+}
+
+local numeric-headers =
+   [ MATCH .*libs/numeric/(.*)/include/boost : [ glob libs/*/*/include/boost ] ] ;
+
+for dir in $(numeric-headers)
+{
+    link-directory numeric-$(dir)-headers : libs/numeric/$(dir)/include/boost : <location>. ;
+}
+
+BOOST_MODULARLAYOUT = $(all-headers) $(numeric-headers) ;
+if $(BOOST_MODULARLAYOUT)
+{
+    echo modularized layout build ;
+}
+
 project boost
     : requirements <include>.
       # Disable auto-linking for all targets here, primarily because it caused
@@ -210,7 +234,7 @@
     }
 }
 
-alias headers : : : : <include>. ;
+alias headers : $(all-headers)-headers numeric-$(numeric-headers)-headers : : : <include>.  ;
 explicit headers ;
 
 # Make project ids of all libraries known.

Modified: branches/modular-build/libs/geometry/index/example/Jamfile.v2
==============================================================================
--- branches/modular-build/libs/geometry/index/example/Jamfile.v2	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/geometry/index/example/Jamfile.v2	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -18,7 +18,7 @@
 
 project boost-geometry-index-example
     : requirements
-        <source>/boost//headers
+        <implicit-dependency>/boost//headers
     ;
 
 local GLUT_ROOT = [ os.environ GLUT_ROOT ] ;

Modified: branches/modular-build/libs/numeric/odeint/examples/vexcl/Jamfile.v2
==============================================================================
--- branches/modular-build/libs/numeric/odeint/examples/vexcl/Jamfile.v2	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/numeric/odeint/examples/vexcl/Jamfile.v2	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -21,7 +21,7 @@
 lib opencl : : <name>OpenCL ;
 
 project : requirements
-        <library>/boost//headers
+        <implicit-dependency>/boost//headers
         <include>../../../../..
         <include>$(VEXCL_INCLUDE)
         <include>$(CUDA_INCLUDE)

Modified: branches/modular-build/libs/parameter/doc/html/index.html
==============================================================================
--- branches/modular-build/libs/parameter/doc/html/index.html	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/parameter/doc/html/index.html	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -37,7 +37,7 @@
 </tbody>
 </table>
 <!-- @jam_prefix.append('''
-project test : requirements <include>. <source>/boost//headers ;''') -->
+project test : requirements <include>. <implicit-dependency>/boost//headers ;''') -->
 <!-- @example.prepend('''
 #include <boost/parameter.hpp>
 

Modified: branches/modular-build/libs/parameter/doc/index.rst
==============================================================================
--- branches/modular-build/libs/parameter/doc/index.rst	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/parameter/doc/index.rst	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -30,7 +30,7 @@
   can be deduced from their types.
 
 .. @jam_prefix.append('''
-        project test : requirements <include>. <source>/boost//headers ;''')
+        project test : requirements <include>. <implicit-dependency>/boost//headers ;''')
 
 .. @example.prepend('''
    #include <boost/parameter.hpp>

Modified: branches/modular-build/libs/python/example/Jamroot
==============================================================================
--- branches/modular-build/libs/python/example/Jamroot	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/python/example/Jamroot	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -11,7 +11,10 @@
 # boost_python library from the project whose global ID is
 # /boost/python.
 project
-  : requirements <library>/boost/python//boost_python ;
+  : requirements <library>/boost/python//boost_python 
+                 <implicit-dependency>/boost//headers 
+  : usage-requirements <implicit-dependency>/boost//headers 
+  ;
 
 # Declare the three extension modules.  You can specify multiple
 # source files after the colon separated by spaces.

Modified: branches/modular-build/libs/python/example/quickstart/Jamroot
==============================================================================
--- branches/modular-build/libs/python/example/quickstart/Jamroot	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/python/example/quickstart/Jamroot	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -12,6 +12,8 @@
 # /boost/python.
 project boost-python-quickstart
   : requirements <library>/boost/python//boost_python 
+    		 <implicit-dependency>/boost//headers 
+  : usage-requirements <implicit-dependency>/boost//headers 	 
     ;
 
 # Make the definition of the python-extension rule available

Modified: branches/modular-build/libs/python/example/tutorial/Jamroot
==============================================================================
--- branches/modular-build/libs/python/example/tutorial/Jamroot	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/python/example/tutorial/Jamroot	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -20,7 +20,10 @@
 # boost_python library from the project whose global ID is
 # /boost/python.
 project
-  : requirements <library>/boost/python//boost_python ;
+  : requirements <library>/boost/python//boost_python 
+                 <implicit-dependency>/boost//headers 
+  : usage-requirements <implicit-dependency>/boost//headers 
+  ;
 
 # Declare the three extension modules.  You can specify multiple
 # source files after the colon separated by spaces.

Modified: branches/modular-build/libs/signals2/example/Jamfile.v2
==============================================================================
--- branches/modular-build/libs/signals2/example/Jamfile.v2	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/signals2/example/Jamfile.v2	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -8,7 +8,7 @@
 
 # For more information, see http://www.boost.org
 
-project : requirements <source>/boost//headers ;
+project : requirements <implicit-dependency>/boost//headers ;
 
 exe hello_world_slot : hello_world_slot.cpp ;
 

Modified: branches/modular-build/libs/spirit/example/qi/json/build/Jamfile
==============================================================================
--- branches/modular-build/libs/spirit/example/qi/json/build/Jamfile	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/spirit/example/qi/json/build/Jamfile	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -24,8 +24,8 @@
 
 
 lib json
-   : [ glob ../src/*.cpp ]
-          /boost//headers
+   : [ glob ../src/*.cpp ] : 
+          <implicit-dependency>/boost//headers
         :
    :
    : <include>..

Modified: branches/modular-build/libs/units/test/Jamfile.v2
==============================================================================
--- branches/modular-build/libs/units/test/Jamfile.v2	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/libs/units/test/Jamfile.v2	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -16,7 +16,7 @@
 
 project boost/units/test :
     requirements
-        <source>/boost//headers
+        <implicit-dependency>/boost//headers
         <include>../../..
         <toolset>msvc:<asynch-exceptions>on
         $(warning-compilers):$(warning-options)

Modified: branches/modular-build/tools/Jamfile.v2
==============================================================================
--- branches/modular-build/tools/Jamfile.v2	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/tools/Jamfile.v2	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -12,6 +12,9 @@
     :
     requirements
     <link>static
+    <implicit-dependency>/boost//headers 
+    : 
+    usage-requirements <implicit-dependency>/boost//headers 
     ;
 
 use-project /boost/regression : regression/build ;

Modified: branches/modular-build/tools/regression/build/Jamroot.jam
==============================================================================
--- branches/modular-build/tools/regression/build/Jamroot.jam	Wed Sep 25 04:32:03 2013	(r85888)
+++ branches/modular-build/tools/regression/build/Jamroot.jam	2013-09-25 04:35:32 EDT (Wed, 25 Sep 2013)	(r85889)
@@ -37,7 +37,7 @@
     :
     <define>BOOST_ALL_NO_LIB=1
     <define>_CRT_SECURE_NO_WARNINGS
-    <use>/boost//headers
+    <implicit-dependency>/boost//headers
     :
     release
     ;
@@ -51,7 +51,7 @@
     :
     <define>BOOST_ALL_NO_LIB=1
     <define>_CRT_SECURE_NO_WARNINGS
-    <use>/boost//headers
+    <implicit-dependency>/boost//headers
     :
     release
     ;
@@ -64,7 +64,7 @@
     /boost/filesystem//boost_filesystem/<link>static
     :
     <define>BOOST_ALL_NO_LIB=1
-    <use>/boost//headers
+    <implicit-dependency>/boost//headers
     :
     release
     ;
@@ -77,7 +77,7 @@
     /boost/filesystem//boost_filesystem/<link>static
     :
     <define>BOOST_ALL_NO_LIB=1
-    <use>/boost//headers
+    <implicit-dependency>/boost//headers
     :
     release
     ;
@@ -94,7 +94,7 @@
     /boost//iostreams/<link>static
     :
     <define>BOOST_ALL_NO_LIB=1
-    <use>/boost//headers
+    <implicit-dependency>/boost//headers
     :
     release
     ;