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

Subject: [Boost-commit] svn:boost r55334 - trunk/tools/build/v2/tools
From: ghost_at_[hidden]
Date: 2009-08-01 06:33:24

Author: vladimir_prus
Date: 2009-08-01 06:33:24 EDT (Sat, 01 Aug 2009)
New Revision: 55334
URL: http://svn.boost.org/trac/boost/changeset/55334

Log:
Fix improper name of PDB and manifest targets.

Text files modified: 
   trunk/tools/build/v2/tools/msvc.jam |    11 ++++++++---                             
   1 files changed, 8 insertions(+), 3 deletions(-)

Modified: trunk/tools/build/v2/tools/msvc.jam
==============================================================================
--- trunk/tools/build/v2/tools/msvc.jam	(original)
+++ trunk/tools/build/v2/tools/msvc.jam	2009-08-01 06:33:24 EDT (Sat, 01 Aug 2009)
@@ -1031,11 +1031,13 @@
 
         if $(result)
         {
-            local name = [ $(result[0]).name ] ;
+            local name-main = [ $(result[0]).name ] ;
             local action = [ $(result[0]).action ] ;
             
             if [ $(property-set).get <debug-symbols> ] = "on"
-            {
+            {		 
+                # PDB is 'good' target -- the basename is the same of for main target, with
+                # .pdb as extension              
                 local target = [ class.new file-target $(name) : PDB : $(project) : $(action) ] ;
                 local registered-target = [ virtual-target.register $(target) ] ;
                 if $(target) != $(registered-target)
@@ -1047,7 +1049,10 @@
 
             if [ $(property-set).get <embed-manifest> ] = "off"
             {
-                local target = [ class.new file-target $(name) : MANIFEST : $(project) : $(action) ] ;
+                # Manifest is evil target. It has .manifest appened to the name of 
+                # main target, including extension. E.g. a.exe.manifest. We use 'exact'
+                # name because to achieve this effect.
+                local target = [ class.new file-target $(name-main).manifest exact : MANIFEST : $(project) : $(action) ] ;
                 local registered-target = [ virtual-target.register $(target) ] ;
                 if $(target) != $(registered-target)
                 {