mirror of
https://github.com/boostorg/build.git
synced 2026-02-18 01:52:17 +00:00
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]
This commit is contained in:
@@ -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)
|
||||
: <xsl:param>doxygen.xml.path=$(collect-path) ;
|
||||
: <xsl:param>doxygen.xml.path="$(native-path)" ;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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)"
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user