[Boost-commit] svn:boost r64794 - trunk

Subject: [Boost-commit] svn:boost r64794 - trunk
From: ghost_at_[hidden]
Date: 2010-08-14 03:21:11

Author: vladimir_prus
Date: 2010-08-14 03:21:08 EDT (Sat, 14 Aug 2010)
New Revision: 64794
URL: http://svn.boost.org/trac/boost/changeset/64794

Log:
Jamroot fixes: use right path for headers, simplify some things.

Text files modified: 
   trunk/Jamroot      |     7 +++----                                 
   trunk/boostcpp.jam |     3 ++-                                     
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/Jamroot
==============================================================================
--- trunk/Jamroot	(original)
+++ trunk/Jamroot	2010-08-14 03:21:08 EDT (Sat, 14 Aug 2010)
@@ -129,6 +129,7 @@
 import sequence ;
 import xsltproc ;
 import set ;
+import path ;
 
 path-constant BOOST_ROOT : . ;
 constant BOOST_VERSION : 1.44.0 ;
@@ -242,9 +243,7 @@
 
     install stage : $(libraries) : <location>$(BOOST_STAGE_LOCATE) ;
 
-    local c = [ project.current ] ;
-    local project-module = [ $(c).project-module ] ;
-    module $(project-module)
+    module [ CALLER_MODULE ]
     {
         explicit stage ;
         explicit install ;
@@ -261,4 +260,4 @@
 
 # Declare special top-level targets that build and install the desired variants
 # of the libraries.
-boostcpp.declare_targets $(all-libraries) : $(headers) ;
+boostcpp.declare-targets $(all-libraries) : $(headers) ;

Modified: trunk/boostcpp.jam
==============================================================================
--- trunk/boostcpp.jam	(original)
+++ trunk/boostcpp.jam	2010-08-14 03:21:08 EDT (Sat, 14 Aug 2010)
@@ -31,6 +31,7 @@
 ##############################################################################  
 
 BOOST_ROOT = [ modules.binding $(__name__) ] ;
+BOOST_ROOT = $(BOOST_ROOT:D) ;
 
 rule set-version ( version )
 {
@@ -552,7 +553,7 @@
    }
 }
 
-rule declare_targets ( all-libraries * : headers * )
+rule declare-targets ( all-libraries * : headers * )
 {
     configure.register-components $(all-libraries) ;