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

Subject: [Boost-commit] svn:boost r55221 - in branches/release/tools/build/v2: . test tools
From: ghost_at_[hidden]
Date: 2009-07-30 14:43:55

Author: vladimir_prus
Date: 2009-07-28 03:12:10 EDT (Tue, 28 Jul 2009)
New Revision: 55221
URL: http://svn.boost.org/trac/boost/changeset/55221

Log:
Merge revision 55220
Properties modified: 
   branches/release/tools/build/v2/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/test/BoostBuild.py |     7 ++++---                                 
   branches/release/tools/build/v2/tools/doxygen.jam  |    17 ++++++++++++++---                       
   2 files changed, 18 insertions(+), 6 deletions(-)

Modified: branches/release/tools/build/v2/test/BoostBuild.py
==============================================================================
--- branches/release/tools/build/v2/test/BoostBuild.py	(original)
+++ branches/release/tools/build/v2/test/BoostBuild.py	2009-07-28 03:12:10 EDT (Tue, 28 Jul 2009)
@@ -667,9 +667,10 @@
         self.ignore('*/gmon.out')
 
         if not self.unexpected_difference.empty():
-            print 'FAILED'
-            print '------- The following changes were unexpected -------'
-            self.unexpected_difference.pprint()
+            annotation('failure', 'Unexpected changes found')
+            output = StringIO.StringIO()
+            self.unexpected_difference.pprint(output)
+            annotation("unexpected changes", output.getvalue())
             self.fail_test(1)
 
     def __expect_line(self, content, expected, expected_to_exist):

Modified: branches/release/tools/build/v2/tools/doxygen.jam
==============================================================================
--- branches/release/tools/build/v2/tools/doxygen.jam	(original)
+++ branches/release/tools/build/v2/tools/doxygen.jam	2009-07-28 03:12:10 EDT (Tue, 28 Jul 2009)
@@ -354,9 +354,20 @@
     {
         # Build an HTML directory from the sources.
         local html-location = [ feature.get-values <location> : $(requirements) ] ;
-        local output-dir = [ path.root
-            [ path.join [ $(project).get build-dir ] $(html-location:E=html) ]
-            [ path.pwd ] ] ;
+        local output-dir ;
+        if [ $(project).get build-dir ] 
+        {
+            # Explicitly specified build dir. Add html at the end.
+            output-dir = [ path.join [ $(project).build-dir ] $(html-location:E=html) ] ;
+        }
+        else
+        {
+            # Trim 'bin' from implicit build dir, for no other reason that backward
+            # compatibility.
+            output-dir = [ path.join [ path.parent [ $(project).build-dir ] ] 
+              $(html-location:E=html) ] ;
+        }
+        output-dir = [ path.root $(output-dir) [ path.pwd ] ] ;        
         local output-dir-native = [ path.native $(output-dir) ] ;
         requirements = [ property.change $(requirements) : <location> ] ;