From ff14ae6daf78a6962537431a3bde39ecb4859259 Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine@gmail.com" Date: Wed, 10 Jul 2013 04:38:21 +0000 Subject: Fix documentation building on Linux git-svn-id: http://pugixml.googlecode.com/svn/trunk@947 99668b35-9821-0410-8761-19e4c4f06640 --- Jamrules.jam | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Jamrules.jam b/Jamrules.jam index e03cfb7..dadf37a 100644 --- a/Jamrules.jam +++ b/Jamrules.jam @@ -836,14 +836,26 @@ else } } +if ( $(OS) = NT ) +{ + QUICKBOOK = %QUICKBOOK_PATH%\bin\quickbook.exe ; + XSLTPROC = %QUICKBOOK_PATH%\bin\xsltproc.exe ; +} +else +{ + QUICKBOOK = quickbook ; + XSLTPROC = xsltproc ; + QUICKBOOK_PATH = /usr/share ; +} + actions QuickbookAction { - %QUICKBOOK_PATH%\bin\quickbook.exe --output-file $(<) --input-file $(>) >nul + $(QUICKBOOK) --output-file $(<) --input-file $(>) } actions response XSLTProcAction { - %QUICKBOOK_PATH%\bin\xsltproc.exe --path$(SPACE)$(XSLPATH:C) --stringparam$(SPACE)$(XSLPARAM) --output $(<) @( + $(XSLTPROC) --nonet --novalid --path$(SPACE)$(XSLPATH:C) --stringparam$(SPACE)$(XSLPARAM) --output $(<) @( ) $(>) @@ -974,12 +986,6 @@ rule QuickbookImport SOURCE : IMPORT Includes $(SOURCE) : $(SOURCE:D)/$(IMPORT) ; } -rule FullPath FILE -{ - local PWD = [ Subst [ Shell "cd" ] : "%c" : "" ] ; - return "$(PWD)/$(FILE)" ; -} - rule Documentation TARGET : SOURCE : STYLESHEET { # escape colon with %3A because colon is a path list separator @@ -1007,7 +1013,7 @@ rule Documentation TARGET : SOURCE : STYLESHEET # docbook -> html local HTML = $(TARGET) ; - XSL on $(HTML) = $(QUICKBOOK_PATH)/boostbook/xsl/html.xsl [ FullPath $(STYLESHEET) ] ; + XSL on $(HTML) = $(QUICKBOOK_PATH)/boostbook/xsl/html.xsl $(CWD)/$(STYLESHEET) ; XSLPATH on $(HTML) = $(XSLDIR)/docbook-xml $(XSLDIR)/docbook-xsl/html $(XSLDIR)/docbook-xsl/lib ; XSLPARAM on $(HTML) = -- cgit v1.2.3