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

Try to make sure that the paths for xsltproc are correct for a cygwin build of bjam.

Browse Source 
[SVN r62403]
This commit is contained in:
Steven Watanabe
2010-06-03 15:29:23 +00:00
parent 532bc4ed1b
commit f241e68667
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/boostbook.jam
View File

@@ -330,7 +330,8 @@ rule format-catalog-path ( path )
{
if [ os.name ] = CYGWIN
{
result = [ path.make $(path:W) ] ;
local native-path = [ path.native $(path) ] ;
result = [ path.make $(native-path:W) ] ;
}
}
return [ regex.replace $(result) " " "%20" ] ;

18
src/tools/xsltproc.jam
View File

@@ -55,7 +55,7 @@ rule .is-cygwin ( xsltproc )
[ path.join [ path.parent $(file) ] xsltproc ] ] ;
if [ os.name ] = CYGWIN
{
cygdir = $(dir:W) ;
dir = $(dir:W) ;
}
local command =
"\"$(xsltproc)\" \"$(dir)\\test.xsl\" \"$(dir)\\test.xml\" 2>&1" ;
@@ -120,6 +120,11 @@ local rule .xsltproc ( target : source stylesheet : properties * : dirname ? : a
CATALOG = [ common.variable-setting-command XML_CATALOG_FILES : $(catalog:T) ] ;
}
if [ os.on-windows ] && ! [ is-cygwin ]
{
action = $(action).windows ;
}
$(action) $(target) : $(source) ;
}
@@ -135,6 +140,11 @@ rule xslt-dir ( target : source stylesheet : properties * : dirname )
return [ .xsltproc $(target) : $(source) $(stylesheet) : $(properties) : $(dirname) : xslt-xsltproc-dir ] ;
}
actions xslt-xsltproc.windows
{
$(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<)" "$(STYLESHEET:W)" "$(>:W)"
}
actions xslt-xsltproc bind STYLESHEET
{
@@ -142,6 +152,12 @@ actions xslt-xsltproc bind STYLESHEET
}
actions xslt-xsltproc-dir.windows bind STYLESHEET
{
$(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<:D)/" "$(STYLESHEET:W)" "$(>:W)"
}
actions xslt-xsltproc-dir bind STYLESHEET
{
$(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<:D)/" "$(STYLESHEET:T)" "$(>:T)"