Fixed xsltproc path splitting by escaping colon
git-svn-id: http://pugixml.googlecode.com/svn/trunk@532 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
parent
34cbe32773
commit
18624af75f
13
Jamrules.jam
13
Jamrules.jam
@ -476,7 +476,7 @@ actions QuickbookAction
|
|||||||
|
|
||||||
actions XSLTProcAction
|
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
|
rule MakeFileDir TARGET
|
||||||
@ -601,6 +601,9 @@ rule Coverage TARGET : SOURCE
|
|||||||
|
|
||||||
rule Documentation 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
|
# quickbook -> boostbook
|
||||||
local BOOSTBOOK = $(BUILD)/$(SOURCE:S=.bb.xml) ;
|
local BOOSTBOOK = $(BUILD)/$(SOURCE:S=.bb.xml) ;
|
||||||
|
|
||||||
@ -611,16 +614,16 @@ rule Documentation TARGET : SOURCE
|
|||||||
# boostbook -> docbook
|
# boostbook -> docbook
|
||||||
local DOCBOOK = $(BUILD)/$(SOURCE:S=.db.xml) ;
|
local DOCBOOK = $(BUILD)/$(SOURCE:S=.db.xml) ;
|
||||||
|
|
||||||
XSL on $(DOCBOOK) = %QUICKBOOK_PATH%/boostbook/xsl/docbook.xsl ;
|
XSL on $(DOCBOOK) = $(XSLDIR)/boostbook/xsl/docbook.xsl ;
|
||||||
XSLPATH on $(DOCBOOK) = %QUICKBOOK_PATH%/boostbook/dtd %QUICKBOOK_PATH%/docbook-xml ;
|
XSLPATH on $(DOCBOOK) = $(XSLDIR)/boostbook/dtd $(XSLDIR)/docbook-xml ;
|
||||||
XSLTProcAction $(DOCBOOK) : $(BOOSTBOOK) ;
|
XSLTProcAction $(DOCBOOK) : $(BOOSTBOOK) ;
|
||||||
Depends $(DOCBOOK) : $(BOOSTBOOK) ;
|
Depends $(DOCBOOK) : $(BOOSTBOOK) ;
|
||||||
|
|
||||||
# docbook -> html
|
# docbook -> html
|
||||||
local HTML = $(TARGET) ;
|
local HTML = $(TARGET) ;
|
||||||
|
|
||||||
XSL on $(HTML) = %QUICKBOOK_PATH%/boostbook/xsl/html.xsl ;
|
XSL on $(HTML) = $(XSLDIR)/boostbook/xsl/html.xsl ;
|
||||||
XSLPATH on $(HTML) = %QUICKBOOK_PATH%/docbook-xml %QUICKBOOK_PATH%/docbook-xsl/html %QUICKBOOK_PATH%/docbook-xsl/lib ;
|
XSLPATH on $(HTML) = $(XSLDIR)/docbook-xml $(XSLDIR)/docbook-xsl/html $(XSLDIR)/docbook-xsl/lib ;
|
||||||
|
|
||||||
XSLPARAM on $(HTML) =
|
XSLPARAM on $(HTML) =
|
||||||
"generate.manifest 0"
|
"generate.manifest 0"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user