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

Add convenient top-level aliases for libraries, for example /boost//thread.

[SVN r30873]
Vladimir Prus 20 лет назад
Родитель
Сommit
74367b1fa2
2 измененных файлов с 39 добавлено и 4 удалено
  1. 38 3
      Jamfile.v2
  2. 1 1
      tools/quickbook

+ 38 - 3
Jamfile.v2

@@ -29,6 +29,35 @@ project boost
     : build-dir bin.v2  
     : build-dir bin.v2  
     ;
     ;
 
 
+# Setup convenient aliases for all libraries.
+
+all-libraries = [ MATCH .*libs/(.*)/build/.* 
+                  : [ glob libs/*/build/Jamfile.v2 ] ] ;
+                  
+# First, the complicated libraries: where the target name in
+# Jamfile is different from directory name.
+alias prg_exec_monitor : libs/test/build//boost_prg_exec_monitor ;
+alias test_exec_monitor : libs/test/build//boost_test_exec_monitor ;
+alias unit_test_framework : libs/test/build//boost_unit_test_framework ;
+alias bgl-vis : libs/graps/build//bgl-vis ;
+alias serialization : libs/serialization//serialization ;
+alias wserialization : libs/serialization//wserialization ;
+
+explicit prg_exec_monitor test_exec_monitor unit_test_framework
+    bgl-vis serialization wserialization ;
+                  
+for local l in $(all-libraries) 
+{
+    if ! $(l) in test graph serialization
+    {
+        alias $(l) : libs/$(l)/build//boost_$(l) ;
+        explicit $(l) ;
+    }
+}
+    
+alias headers : : : : <include>. ;
+
+
 # Decides which libraries are to be installed by looking at --with-<library>
 # Decides which libraries are to be installed by looking at --with-<library>
 # --without-<library> arguments. Returns the list of directories under "libs"
 # --without-<library> arguments. Returns the list of directories under "libs"
 # which must be built at installed.
 # which must be built at installed.
@@ -85,8 +114,7 @@ local python-root = [ MATCH "^--with-python-root=(.*)" : $(ARGV) ] ;
 PYTHON_ROOT ?= $(python-root) ;
 PYTHON_ROOT ?= $(python-root) ;
 
 
 # Select the libraries to install.
 # Select the libraries to install.
-libraries = [ MATCH .*libs/(.*)/build/.* : [ glob libs/*/build/Jamfile.v2 ] ] ;
-libraries = [ libraries-to-install $(libraries) ] ;
+libraries = [ libraries-to-install $(all-libraries) ] ;
 
 
 
 
 # This rule is called by Boost.Build to determine the name of 
 # This rule is called by Boost.Build to determine the name of 
@@ -164,7 +192,14 @@ rule boost-install ( libraries * )
         : # No headers, it's handled by the dependency
         : # No headers, it's handled by the dependency
     ;
     ;
 
 
-    install stage : $(libraries) : <location>$(BOOST_STAGE_LOCATE) ;            
+    install stage : $(libraries) : <location>$(BOOST_STAGE_LOCATE) ;
+
+    local c = [ project.current ] ;
+    local project-module = [ $(c).project-module ] ;
+    module $(project-module)
+    {
+        explicit stage ;
+    }        
 }
 }
 
 
 
 

+ 1 - 1
tools/quickbook

@@ -1 +1 @@
-Subproject commit f635aab2641fde722c443cde874c990fbf04b3ed
+Subproject commit 83ac3b00b32a61fdf3195cf2af0de9d3104415e8

粤ICP备19079148号