[Boost-commit] svn:boost r55337 - in branches/release/tools/build/v2: . test test/generators-test tools

Subject: [Boost-commit] svn:boost r55337 - in branches/release/tools/build/v2: . test test/generators-test tools
From: ghost_at_[hidden]
Date: 2009-08-01 06:45:59

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

Log:
Merge testsuite fixes
Properties modified: 
   branches/release/tools/build/v2/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/test/generators-test/extra.jam |    13 +++++++++----                           
   branches/release/tools/build/v2/test/generators-test/nm.jam    |     6 +++++-                                  
   branches/release/tools/build/v2/test/notfile.py                |     2 +-                                      
   branches/release/tools/build/v2/tools/msvc.jam                 |    11 ++++++++---                             
   branches/release/tools/build/v2/tools/symlink.jam              |     2 +-                                      
   5 files changed, 24 insertions(+), 10 deletions(-)

Modified: branches/release/tools/build/v2/test/generators-test/extra.jam
==============================================================================
--- branches/release/tools/build/v2/test/generators-test/extra.jam	(original)
+++ branches/release/tools/build/v2/test/generators-test/extra.jam	2009-08-01 06:45:58 EDT (Sat, 01 Aug 2009)
@@ -65,7 +65,10 @@
 actions whale 
 {
     echo "Whale consuming " $(>)
-    $(TOUCH) $(<)
+    $(TOUCH) $(<[1])
+    $(TOUCH) $(<[2])
+    $(TOUCH) $(<[3])
+    $(TOUCH) $(<[4])
 }
 
 rule dolphin ( targets * : source * : properties * )
@@ -85,7 +88,8 @@
 actions wd
 {    
     echo "WD consuming" $(>)
-    $(TOUCH) $(<)        
+    $(TOUCH) $(<[1])        
+    $(TOUCH) $(<[2])
 }
 
 rule x ( target * : source * : properties * )
@@ -96,7 +100,7 @@
 actions x 
 {
     echo "X: source is " $(>)
-    $(TOUCH) $(<)
+    $(TOUCH) $(<[1])
 }
 
 rule x_pro ( target * : source * : properties * )
@@ -107,7 +111,8 @@
 actions x_pro
 {
     echo "X_PRO: source is " $(>)
-    $(TOUCH) $(<)
+    $(TOUCH) $(<[1])
+    $(TOUCH) $(<[2])
 }
 
 

Modified: branches/release/tools/build/v2/test/generators-test/nm.jam
==============================================================================
--- branches/release/tools/build/v2/test/generators-test/nm.jam	(original)
+++ branches/release/tools/build/v2/test/generators-test/nm.jam	2009-08-01 06:45:58 EDT (Sat, 01 Aug 2009)
@@ -4,6 +4,9 @@
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 import modules ;
+import common ;
+
+TOUCH = [ common.file-touch-command ] ;
 
 rule target-source ( targets * : sources * : properties * )
 {
@@ -30,7 +33,8 @@
 actions cpp-mark
 {
     echo "CPP-MARK consuming " $(>)
-    touch $(<)
+    $(TOUCH) $(<[1])
+    $(TOUCH) $(<[2])
 }
 
 

Modified: branches/release/tools/build/v2/test/notfile.py
==============================================================================
--- branches/release/tools/build/v2/test/notfile.py	(original)
+++ branches/release/tools/build/v2/test/notfile.py	2009-08-01 06:45:58 EDT (Sat, 01 Aug 2009)
@@ -22,7 +22,7 @@
 
 actions valgrind
 {
-   valgrind $(>) 
+   valgrind $(>[1]) 
 }
 """)
 

Modified: branches/release/tools/build/v2/tools/msvc.jam
==============================================================================
--- branches/release/tools/build/v2/tools/msvc.jam	(original)
+++ branches/release/tools/build/v2/tools/msvc.jam	2009-08-01 06:45:58 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)
                 {

Modified: branches/release/tools/build/v2/tools/symlink.jam
==============================================================================
--- branches/release/tools/build/v2/tools/symlink.jam	(original)
+++ branches/release/tools/build/v2/tools/symlink.jam	2009-08-01 06:45:58 EDT (Sat, 01 Aug 2009)
@@ -133,7 +133,7 @@
 actions ln-NT
 {
     echo "NT symlinks not supported yet, making copy"
-    del /f /q "$(<)" 2$(NULL_OUT) $(NULL_OUT)
+    del /f /q "$(<)" 2>nul >nul
     copy "$(>)" "$(<)" $(NULL_OUT)
 }