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

From: jurko.gospodnetic_at_[hidden]
Date: 2008-07-01 03:23:29

Author: jurko
Date: 2008-07-01 03:23:28 EDT (Tue, 01 Jul 2008)
New Revision: 46942
URL: http://svn.boost.org/trac/boost/changeset/46942

Log:
Corrected doxygen.xml.path xslt parameter construction in the collect rule in the doxygen.jam module so it uses the native path format instead of the path format used internally by Boost Build. Added a few command parameter quotes to make it more likely Boost Build doxygen & quickbook toolsets will work with paths containing spaces.
Text files modified: 
   trunk/tools/build/v2/tools/doxygen.jam   |     8 +++++---                                
   trunk/tools/build/v2/tools/quickbook.jam |     2 +-                                      
   2 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/tools/build/v2/tools/doxygen.jam
==============================================================================
--- trunk/tools/build/v2/tools/doxygen.jam	(original)
+++ trunk/tools/build/v2/tools/doxygen.jam	2008-07-01 03:23:28 EDT (Tue, 01 Jul 2008)
@@ -181,7 +181,7 @@
 #
 actions doxygen-action
 {
-    $(RM) "$(*.XML)" & "$(NAME:E=doxygen)" $(>) && echo "Stamped" > "$(<)"
+    $(RM) "$(*.XML)" & "$(NAME:E=doxygen)" "$(>)" && echo "Stamped" > "$(<)"
 }
 
 
@@ -283,10 +283,12 @@
         = [ path.make [ on $(source) return $(LOCATE) ] ] ;
     local collect-path
         = [ path.root [ path.pwd ] [ path.join $(source-path) $(source:B) ] ] ;
+    local native-path
+        = [ path.native $(collect-path) ] ;
     local real-source
-        = [ path.native [ path.join [ path.native $(collect-path) ] index.xml ] ] ;
+        = [ path.native [ path.join $(collect-path) index.xml ] ] ;
     xsltproc.xslt $(target) : $(real-source) $(collect-xsl-dir:S=.xsl)
-        : <xsl:param>doxygen.xml.path=$(collect-path) ;
+        : <xsl:param>doxygen.xml.path="$(native-path)" ;
 }
 
 

Modified: trunk/tools/build/v2/tools/quickbook.jam
==============================================================================
--- trunk/tools/build/v2/tools/quickbook.jam	(original)
+++ trunk/tools/build/v2/tools/quickbook.jam	2008-07-01 03:23:28 EDT (Tue, 01 Jul 2008)
@@ -309,7 +309,7 @@
 
 actions quickbook-to-boostbook
 {
-    "$(QB-COMMAND)" -I"$(INCLUDES)" --output-file=$(1) $(2)  
+    "$(QB-COMMAND)" -I"$(INCLUDES)" --output-file="$(1)" "$(2)"  
 }