Просмотр исходного кода

Configuration framework and boost.math long long configuration.

[SVN r59867]
Vladimir Prus 16 лет назад
Родитель
Сommit
e01519a17b
3 измененных файлов с 25 добавлено и 8 удалено
  1. 23 6
      Jamroot
  2. 1 1
      libs/math
  3. 1 1
      tools/build

+ 23 - 6
Jamroot

@@ -135,6 +135,8 @@ import targets ;
 import project ;
 import option ;
 import xsltproc ;
+import build-system ;
+import configure ;
 
 path-constant BOOST_ROOT : . ;
 constant BOOST_VERSION : 1.43.0 ;
@@ -208,6 +210,7 @@ all-libraries = [ sequence.unique $(all-libraries) ] ;
 # purposes, there's no library to build and install.
 all-libraries = [ set.difference $(all-libraries) : function_types ] ;
 
+configure.register-components $(all-libraries) ;
 
 local rule explicit-alias ( id : targets + )
 {
@@ -330,6 +333,7 @@ PYTHON_ROOT ?= $(python-root) ;
 
 # Select the libraries to install.
 libraries = [ libraries-to-install $(all-libraries) ] ;
+configure.components-building $(libraries) ;
 
 if --show-libraries in [ modules.peek : ARGV ]
 {
@@ -667,8 +671,23 @@ message explain :
 "\nBuilding the Boost C++ Libraries.\n\n" ;
 explicit explain ;
 
-import build-system ;
-rule say ( ok ? ) 
+rule pre-build ( )
+{
+    local tl = [ modules.peek : top-level-targets ] ;
+    if stage in $(tl) || install in $(tl)
+    {
+        # FIXME: remove if when Boost regression tests use trunk
+        # bjam.
+        if PAD in [ RULENAMES ]
+        {            
+            configure.print-component-configuration ;
+        }        
+    }
+}
+IMPORT $(__name__) : pre-build : : $(__name__).pre-build ;
+build-system.set-pre-build-hook $(__name__).pre-build ;
+
+rule post-build ( ok ? ) 
 {
     if forward in [ modules.peek : top-level-targets ] 
     {        
@@ -688,10 +707,8 @@ The following directory should be added to linker library paths:
         }    
     }    
 }
-IMPORT $(__name__) : say : : $(__name__).say ;
-
-build-system.set-post-build-hook $(__name__).say ;
-
+IMPORT $(__name__) : post-build : : $(__name__).post-build ;
+build-system.set-post-build-hook $(__name__).post-build ;
 
 # This rule should be called from libraries' Jamfiles and will create two
 # targets, "install" and "stage", that will install or stage that library. The

+ 1 - 1
libs/math

@@ -1 +1 @@
-Subproject commit 5c5da68a340ac87aa7fd13a2d87b51dbd15802e2
+Subproject commit 6e4ce5db3c976bc6862f109436d04ace5690febd

+ 1 - 1
tools/build

@@ -1 +1 @@
-Subproject commit b50d69df139d1f5562295b9ca7565d902f4d09ed
+Subproject commit 1fb10d066cea609b7bf66909730f8b45494e4b34

粤ICP备19079148号