[Boost-commit] svn:boost r38920 - trunk/tools/build/v2/tools

From: ghost_at_[hidden]
Date: 2007-08-25 00:36:03

Author: vladimir_prus
Date: 2007-08-25 00:36:02 EDT (Sat, 25 Aug 2007)
New Revision: 38920
URL: http://svn.boost.org/trac/boost/changeset/38920

Log:
Revert mistaken commit
Text files modified: 
   trunk/tools/build/v2/tools/builtin.jam |    29 ++++++++++++++++-------------           
   1 files changed, 16 insertions(+), 13 deletions(-)

Modified: trunk/tools/build/v2/tools/builtin.jam
==============================================================================
--- trunk/tools/build/v2/tools/builtin.jam	(original)
+++ trunk/tools/build/v2/tools/builtin.jam	2007-08-25 00:36:02 EDT (Sat, 25 Aug 2007)
@@ -333,28 +333,31 @@
     rule __init__ ( name     
         : project 
         : shared ?                                
+        : real-name ?
         : search *
         : action
     )
     {
-        abstract-file-target.__init__ $(name) exact : SEARCHED_LIB : $(project) 
-          : $(action) : ;
-        
-        local rn = [ apply-tag $(name) : [ tag-properties ] ] ;
-        if $(rn)
-        {
-           self.name = $(rn) ;
-        }        
+        abstract-file-target.__init__ $(name) : SEARCHED_LIB : $(project) 
+          : $(action) ;
         
         self.shared = $(shared) ;
+        self.real-name = $(real-name) ;
+        self.real-name ?= $(name) ;
         self.search = $(search) ;
     }
-        
+    
+    
     rule shared ( )
     {
         return $(self.shared) ;
     }
-        
+    
+    rule real-name ( ) 
+    {
+        return $(self.real-name) ;
+    }
+    
     rule search ( )
     {
         return $(self.search) ;
@@ -575,8 +578,8 @@
             local search = [ feature.get-values <search> : $(properties) ] ;
 
             a = [ new null-action $(property-set) ] ;
-            local lib-name = [ feature.get-values <name> : $(properties) ] ;
-            local t = [ new searched-lib-target $(lib-name) : $(project) : $(shared)
+            local t = [ new searched-lib-target $(name) : $(project) : $(shared)
+                            : [ feature.get-values <name> : $(properties) ]
                             : $(search)
                             : $(a)
                       ] ;
@@ -806,7 +809,7 @@
         {
             if [ type.is-derived [ $(s).type ] SEARCHED_LIB ]
             {
-                local name = [ $(s).name ] ;
+                local name = [ $(s).real-name ] ;
                 if [ $(s).shared ] 
                 {                    
                     fsa +=  $(name) ;