From 0035222098d207c76c666fa85f1995f04004e871 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sat, 17 Nov 2007 22:09:26 +0000
Subject: [PATCH] Change "actual" to the more natural "target", and change
 "target" to "path". Add bjam command and bb version to XML.

[SVN r41186]
---
 src/build-system.jam | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/build-system.jam b/src/build-system.jam
index 4584de910..af53ad660 100755
--- a/src/build-system.jam
+++ b/src/build-system.jam
@@ -499,17 +499,20 @@ if $(.out-xml)
         # Prepare valid XML header and footer with some basic info
         local nl = "
 " ;
-        local jam = [ modules.peek : JAM_VERSION ] ;
+        local jam = [ version.jam ] ;
         local os = [ modules.peek : OS OSPLAT JAMUNAME ] "" ;
         local timestamp = [ modules.peek : JAMDATE ] ;
         local cwd = [ PWD ] ;
+        local command = [ modules.peek : ARGV ] ;
+        local bb-version = [ version.boost-build ] ;
         .header on $(xml-file) =
             "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-            "$(nl)<build version=\"1.0\">"
+            "$(nl)<build format=\"1.0\" version=\"$(bb-version)\">"
             "$(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>"
+            "$(nl)  <command><![CDATA[\"$(command:J=\" \")\"]]></command>"
             ;
         .footer on $(xml-file) =
             "$(nl)</build>" ;
@@ -603,9 +606,10 @@ if $(.out-xml)
         }
         
         local locate = [ on $(target) return $(LOCATE) ] ;
+        locate ?= "" ;
         .contents on $(xml-file) +=
-            "$(nl)    <actual><![CDATA[$(target)]]></actual>"
-            "$(nl)    <target><![CDATA[$(target:G=:R=$(locate))]]></target>"
+            "$(nl)    <target><![CDATA[$(target)]]></target>"
+            "$(nl)    <path><![CDATA[$(target:G=:R=$(locate))]]></path>"
             "$(nl)    <command><![CDATA[$(command)]]></command>"
             "$(nl)    <output><![CDATA[$(output)]]></output>"
             ;