[Boost-commit] svn:boost r41184 - branches/bitten/tools/build/v2

From: dave_at_[hidden]
Date: 2007-11-17 16:26:38

Author: dave
Date: 2007-11-17 16:26:38 EST (Sat, 17 Nov 2007)
New Revision: 41184
URL: http://svn.boost.org/trac/boost/changeset/41184

Log:
Roll in Rene's changes from r41182

Text files modified: 
   branches/bitten/tools/build/v2/build-system.jam |     8 +++++---                                
   1 files changed, 5 insertions(+), 3 deletions(-)

Modified: branches/bitten/tools/build/v2/build-system.jam
==============================================================================
--- branches/bitten/tools/build/v2/build-system.jam	(original)
+++ branches/bitten/tools/build/v2/build-system.jam	2007-11-17 16:26:38 EST (Sat, 17 Nov 2007)
@@ -503,12 +503,14 @@
         local jam = [ modules.peek : JAM_VERSION ] ;
         local os = [ modules.peek : OS OSPLAT JAMUNAME ] "" ;
         local timestamp = [ modules.peek : JAMDATE ] ;
+        local cwd = [ PWD ] ;
         .header on $(xml-file) =
             "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
             "$(nl)<build version=\"1.0\">"
-            "$(nl)  <jam><![CDATA[$(jam:J=.)]]></jam>"
+            "$(nl)  <jam version=\"$(jam:J=.)\" />"
             "$(nl)  <os name=\"$(os[1])\" platform=\"$(os[2])\"><![CDATA[$(os[3-]:J= )]]></os>"
             "$(nl)  <timestamp><![CDATA[$(timestamp)]]></timestamp>"
+            "$(nl)  <directory><![CDATA[$(cwd)]]></directory>"
             ;
         .footer on $(xml-file) =
             "$(nl)</build>" ;
@@ -553,8 +555,7 @@
 " ;
         # Open the action with some basic info.
         .contents on $(xml-file) +=
-            "$(nl)  <action actual=\"$(target)\""
-            "$(nl)    status=\"$(status)\" user=\"$(user)\" system=\"$(system)\">"
+            "$(nl)  <action status=\"$(status)\" user=\"$(user)\" system=\"$(system)\">"
             ;
         
         # If we have an action object we can print out more detailed info.
@@ -604,6 +605,7 @@
         
         local locate = [ on $(target) return $(LOCATE) ] ;
         .contents on $(xml-file) +=
+            "$(nl)    <actual><![CDATA[$(target)]]></actual>"
             "$(nl)    <target><![CDATA[$(target:G=:R=$(locate))]]></target>"
             "$(nl)    <command><![CDATA[$(command)]]></command>"
             "$(nl)    <output><![CDATA[$(output)]]></output>"