From 35e1fd98f91c037d7a3961c52ddbfee9915f6423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= Date: Tue, 1 Jul 2008 07:23:28 +0000 Subject: [PATCH] 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. [SVN r46942] --- src/tools/doxygen.jam | 8 +++++--- src/tools/quickbook.jam | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tools/doxygen.jam b/src/tools/doxygen.jam index d11abe47e..64c9f9d6b 100644 --- a/src/tools/doxygen.jam +++ b/src/tools/doxygen.jam @@ -181,7 +181,7 @@ rule name ( ) # actions doxygen-action { - $(RM) "$(*.XML)" & "$(NAME:E=doxygen)" $(>) && echo "Stamped" > "$(<)" + $(RM) "$(*.XML)" & "$(NAME:E=doxygen)" "$(>)" && echo "Stamped" > "$(<)" } @@ -283,10 +283,12 @@ rule collect ( target : source : properties * ) = [ 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) - : doxygen.xml.path=$(collect-path) ; + : doxygen.xml.path="$(native-path)" ; } diff --git a/src/tools/quickbook.jam b/src/tools/quickbook.jam index 396cede75..0b2fb00d3 100644 --- a/src/tools/quickbook.jam +++ b/src/tools/quickbook.jam @@ -309,7 +309,7 @@ rule quickbook-to-boostbook ( target : source : properties * ) actions quickbook-to-boostbook { - "$(QB-COMMAND)" -I"$(INCLUDES)" --output-file=$(1) $(2) + "$(QB-COMMAND)" -I"$(INCLUDES)" --output-file="$(1)" "$(2)" }