Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31075/tools/build/v2/tools
Modified Files:
Tag: RC_1_34_0
boostbook.jam builtin.jam xsltproc.jam
Log Message:
(merge from head) Add generic <flags> feature. Fix minor validation problem
with boostbook.
Index: boostbook.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/boostbook.jam,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -d -r1.38.2.1 -r1.38.2.2
--- boostbook.jam 5 Nov 2006 07:24:37 -0000 1.38.2.1
+++ boostbook.jam 14 Nov 2006 05:37:44 -0000 1.38.2.2
@@ -1,6 +1,6 @@
# Copyright 2003, 2004, 2005 Dave Abrahams
# Copyright 2003, 2004, 2005 Douglas Gregor
-# Copyright 2005 Rene Rivera
+# Copyright 2005, 2006 Rene Rivera
# Copyright 2003, 2004, 2005 Vladimir Prus
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or
http://www.boost.org/LICENSE_1_0.txt)
@@ -113,12 +113,6 @@
: $(search-dirs:J="
") ;
}
- # Add trailing slash since some other code
- # uses :B modifier to add last element, and fails
- # without trailing slash. The code really should be fixed,
- # but not now.
- .boostbook-xsl-dir = $(.boostbook-xsl-dir)/ ;
- .boostbook-dtd-dir = $(.boostbook-dtd-dir)/ ;
# Register generators only if we've were called via "using boostbook ; "
generators.register-standard boostbook.dtdxml-to-boostbook : DTDXML : XML ;
@@ -162,36 +156,31 @@
rule boostbook-to-docbook ( target : source : properties * )
{
- local native-path = [ path.native $(.boostbook-xsl-dir) ] ;
- local stylesheet = $(native-path:B=docbook:S=.xsl) ;
+ local stylesheet = [ path.native $(.boostbook-xsl-dir)/docbook.xsl ] ;
xslt $(target) : $(source) $(stylesheet) : $(properties) ;
}
rule docbook-to-onehtml ( target : source : properties * )
{
- local native-path = [ path.native $(.boostbook-xsl-dir) ] ;
- local stylesheet = $(native-path:B=html-single:S=.xsl) ;
+ local stylesheet = [ path.native $(.boostbook-xsl-dir)/html-single.xsl ] ;
xslt $(target) : $(source) $(stylesheet) : $(properties) ;
}
rule docbook-to-htmldir ( target : source : properties * )
{
- local native-path = [ path.native $(.boostbook-xsl-dir) ] ;
- local stylesheet = $(native-path:B=html:S=.xsl) ;
+ local stylesheet = [ path.native $(.boostbook-xsl-dir)/html.xsl ] ;
xslt-dir $(target) : $(source) $(stylesheet) : $(properties) : html ;
}
rule docbook-to-manpages ( target : source : properties * )
{
- local native-path = [ path.native $(.boostbook-xsl-dir) ] ;
- local stylesheet = $(native-path:B=manpages:S=.xsl) ;
+ local stylesheet = [ path.native $(.boostbook-xsl-dir)/manpages.xsl ] ;
xslt-dir $(target) : $(source) $(stylesheet) : $(properties) : man ;
}
rule docbook-to-fo ( target : source : properties * )
{
- local native-path = [ path.native $(.boostbook-xsl-dir) ] ;
- local stylesheet = $(native-path:B=fo:S=.xsl) ;
+ local stylesheet = [ path.native $(.boostbook-xsl-dir)/fo.xsl ] ;
xslt $(target) : $(source) $(stylesheet) : $(properties) ;
}
@@ -272,9 +261,7 @@
# Add the catalog to the property set
local catalog-path = [ $(catalog).path ] ;
- catalog-path = "$(catalog-path)/" ;
- local catalog-file = $(catalog-path:G=<catalog>:B=catalog:S=.xml) ;
- property-set = [ $(property-set).add-raw $(catalog-file) ] ;
+ property-set = [ $(property-set).add-raw
<catalog>$(catalog-path)/catalog.xml ] ;
# local targets = $(catalog) ;
Index: builtin.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/builtin.jam,v
retrieving revision 1.189.2.5
retrieving revision 1.189.2.6
diff -u -d -r1.189.2.5 -r1.189.2.6
--- builtin.jam 10 Nov 2006 17:25:31 -0000 1.189.2.5
+++ builtin.jam 14 Nov 2006 05:37:44 -0000 1.189.2.6
@@ -116,6 +116,9 @@
feature archiveflags : : free ;
feature version : : free ;
+# Generic, i.e. non-lanugage specific, flags for tools.
+feature flags : : free ;
+
feature.feature location-prefix : : free ;
Index: xsltproc.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/xsltproc.jam,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- xsltproc.jam 20 Nov 2005 07:00:25 -0000 1.10
+++ xsltproc.jam 14 Nov 2006 05:37:44 -0000 1.10.2.1
@@ -10,6 +10,7 @@
# Note: except for 'init', this modules does not provide any rules
# for end users.
+import toolset : flags ;
import feature ;
import regex ;
import sequence ;
@@ -38,6 +39,10 @@
rule compute-xslt-flags ( target : properties * )
{
local flags ;
+
+ # Raw flags.
+ flags += [ feature.get-values <flags> : $(properties) ] ;
+
# Translate <xsl:param> into command line flags.
for local param in [ feature.get-values <xsl:param> : $(properties) ]
{
@@ -75,7 +80,7 @@
local rule .xsltproc ( target : source stylesheet : properties * : dirname ? :
action )
{
STYLESHEET on $(target) = $(stylesheet) ;
- FLAGS on $(target) = [ compute-xslt-flags $(target) : $(properties) ] ;
+ FLAGS on $(target) += [ compute-xslt-flags $(target) : $(properties) ] ;
NAME on $(target) = $(.xsltproc) ;
for local catalog in [ feature.get-values <catalog> : $(properties) ]
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
