Re: [Boost-build] CVS: boost/tools/build/tools boostbook.jam,1.13,1.14

From: Vladimir Prus (ghost_at_[hidden])
Date: 2003-08-28 04:38:19

Douglas Gregor wrote:
> Update of /cvsroot/boost/boost/tools/build/tools
> In directory sc8-pr-cvs1:/tmp/cvs-serv11050
>
> Modified Files:
> boostbook.jam
> Log Message:
> - Undo my erroneous change to the error message formatting (thanks Dave)
> - Use BOOST_ROOT to help find the BoostBook DTD & XSL only if its available
> - Use BOOST_BUILD_PATH to help find the BoostBook DTD & XSL (also thanks
> Dave)
>
>
> Index: boostbook.jam
> ===================================================================
> RCS file: /cvsroot/boost/boost/tools/build/tools/boostbook.jam,v
> retrieving revision 1.13
> retrieving revision 1.14
> diff -u -d -r1.13 -r1.14
> --- boostbook.jam	28 Aug 2003 00:13:51 -0000	1.13
> +++ boostbook.jam	28 Aug 2003 03:30:21 -0000	1.14
> @@ -18,6 +18,7 @@
> import property-set ;
> import regex ;
> import scanner ;
> +import sequence ;
> import make ;
> import type ;
> import modules path project ;
> @@ -77,20 +78,32 @@
> {
> .docbook-dtd-dir = [ path.make $(docbook-dtd-dir) ] ;
> }
> -
> - local boost-root = [ path.make [ modules.peek : BOOST_ROOT ] ] ;
> - local search-dirs = [ path.join $(boost-root) tools boostbook ] ;
> - local boostbook-xsl-dir = [ GLOB [ path.native $(search-dirs) ] : xsl
> ] ; - local boostbook-dtd-dir = [ GLOB [ path.native $(search-dirs) ] :
> dtd ] ; +
> + local search-dirs ;
> + if [ modules.peek : BOOST_ROOT ] {
> + local boost-root = [ path.make [ modules.peek : BOOST_ROOT ] ] ;
> + search-dirs = [ path.join $(boost-root) tools boostbook ] ;
> + }
> + local boost-build-root = [
> + sequence.transform path.make : [ modules.peek : BOOST_BUILD_PATH ]
> + ] ;
> + search-dirs += $(boost-build-root)/../boostbook ;
> + local native-search-dirs = [
> + sequence.transform path.native : $(search-dirs)
> + ] ;
> + ECHO $(search-dirs) ;

You did not mean to leave this last line, don't you ;-)

> + local boostbook-xsl-dir = [ GLOB $(native-search-dirs) : xsl ] ;
> + local boostbook-dtd-dir = [ GLOB $(native-search-dirs) : dtd ] ;
> .boostbook-xsl-dir = [ path.make $(boostbook-xsl-dir[1]) ] ;
> .boostbook-dtd-dir = [ path.make $(boostbook-dtd-dir[1]) ] ;
> if ! $(.boostbook-xsl-dir) || ! $(.boostbook-dtd-dir)

One thing that would be beneficial is checking if docbook dtd and xsl paths 
are correctly specified. Not urgent, but nice to have.

- Volodya