boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 00:32:11 +00:00
Code Issues Projects Releases Wiki Activity

Don't hardwire the target directory name of xstl result processing. And allow overriding the default with the 'name' property.

Browse Source 
[SVN r31711]
This commit is contained in:
Rene Rivera
2005-11-20 07:00:25 +00:00
parent a9c22adb8a
commit fe83cf879b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/boostbook.jam
View File

@@ -314,7 +314,9 @@ class boostbook-generator : generator
# Generate HTML/PDF/PS from DOCBOOK.
local target = [ generators.construct $(project) $(manifest)
: $(type) : $(property-set) : $(base-target) ] ;
$(target[2]).set-path $(format) ;
local name = [ $(property-set).get <name> ] ;
name ?= $(format) ;
$(target[2]).set-path $(name) ;
$(target[2]).depends $(catalog) ;
targets += $(target[2]) ;

5
src/tools/xsltproc.jam
View File

@@ -73,7 +73,7 @@ rule compute-xslt-flags ( target : properties * )
local rule .xsltproc ( target : source stylesheet : properties * : dirname ? : action )
{
{
STYLESHEET on $(target) = $(stylesheet) ;
FLAGS on $(target) = [ compute-xslt-flags $(target) : $(properties) ] ;
NAME on $(target) = $(.xsltproc) ;
@@ -83,7 +83,6 @@ local rule .xsltproc ( target : source stylesheet : properties * : dirname ? : a
CATALOG = [ common.variable-setting-command XML_CATALOG_FILES : $(catalog) ] ;
}
DIRECTORY on $(target) = $(dirname) ;
$(action) $(target) : $(source) ;
}
@@ -104,5 +103,5 @@ actions xslt-xsltproc
actions xslt-xsltproc-dir
{
$(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(DIRECTORY)/" "$(STYLESHEET)" "$(>)"
$(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<:D)/" "$(STYLESHEET)" "$(>)"
}