summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-06-23 17:07:25 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-06-23 17:07:25 +0000
commit18624af75fa603a1cbd2722ae92b884bec32b686 (patch)
tree11054771c27f4fee7acfbba13e23e8099d353b79
parent34cbe3277346550d1b475e8f9cc632e0a0fe0721 (diff)
Fixed xsltproc path splitting by escaping colon
git-svn-id: http://pugixml.googlecode.com/svn/trunk@532 99668b35-9821-0410-8761-19e4c4f06640
-rw-r--r--Jamrules.jam13
1 files changed, 8 insertions, 5 deletions
diff --git a/Jamrules.jam b/Jamrules.jam
index c420b7a..6d7d0e4 100644
--- a/Jamrules.jam
+++ b/Jamrules.jam
@@ -476,7 +476,7 @@ actions QuickbookAction
actions XSLTProcAction
{
- %QUICKBOOK_PATH%\bin\xsltproc.exe --path$(SPACE)$(XSLPATH) --stringparam$(SPACE)$(XSLPARAM) --output $(<) $(XSL) $(>)
+ %QUICKBOOK_PATH%\bin\xsltproc.exe --path$(SPACE)$(XSLPATH:C) --stringparam$(SPACE)$(XSLPARAM) --output $(<) $(XSL) $(>)
}
rule MakeFileDir TARGET
@@ -601,6 +601,9 @@ rule Coverage TARGET : SOURCE
rule Documentation TARGET : SOURCE
{
+ # escape colon with %3A because colon is a path list separator
+ local XSLDIR = [ Subst $(QUICKBOOK_PATH) : ":" : "%%%%3A" ] ;
+
# quickbook -> boostbook
local BOOSTBOOK = $(BUILD)/$(SOURCE:S=.bb.xml) ;
@@ -611,16 +614,16 @@ rule Documentation TARGET : SOURCE
# boostbook -> docbook
local DOCBOOK = $(BUILD)/$(SOURCE:S=.db.xml) ;
- XSL on $(DOCBOOK) = %QUICKBOOK_PATH%/boostbook/xsl/docbook.xsl ;
- XSLPATH on $(DOCBOOK) = %QUICKBOOK_PATH%/boostbook/dtd %QUICKBOOK_PATH%/docbook-xml ;
+ XSL on $(DOCBOOK) = $(XSLDIR)/boostbook/xsl/docbook.xsl ;
+ XSLPATH on $(DOCBOOK) = $(XSLDIR)/boostbook/dtd $(XSLDIR)/docbook-xml ;
XSLTProcAction $(DOCBOOK) : $(BOOSTBOOK) ;
Depends $(DOCBOOK) : $(BOOSTBOOK) ;
# docbook -> html
local HTML = $(TARGET) ;
- XSL on $(HTML) = %QUICKBOOK_PATH%/boostbook/xsl/html.xsl ;
- XSLPATH on $(HTML) = %QUICKBOOK_PATH%/docbook-xml %QUICKBOOK_PATH%/docbook-xsl/html %QUICKBOOK_PATH%/docbook-xsl/lib ;
+ XSL on $(HTML) = $(XSLDIR)/boostbook/xsl/html.xsl ;
+ XSLPATH on $(HTML) = $(XSLDIR)/docbook-xml $(XSLDIR)/docbook-xsl/html $(XSLDIR)/docbook-xsl/lib ;
XSLPARAM on $(HTML) =
"generate.manifest 0"