|
Boost-Build : |
From: Joao Abecasis (jpabecasis_at_[hidden])
Date: 2005-02-15 22:51:48
And now actually including the patch...
Sorry about that!
---- Hi! AFAICT boostbook is not honoring <implicit-dependency>. The feature is ignored on all boostbook targets. The attached patch fixes this for the xsltproc toolset, which is used everywhere by the boostbook toolset. As I can't be sure this is the best way to go about solving the issue, I'm posting the code here for review and possible approval. Comments welcome. Daniel James wrote: > Vladimir Prus wrote: > > >>Looks up the usage of program_options in the boost.xml file. I think you >>need to >> >>1. <xi:include your_xml_file_without_any_directory/> >> >>2. Add <implicit-dependency> in doc/Jamfile.v2 on the target which produces >>the xml file. The necessary include path will be set up automatically. >> >>HTH, >>Volodya > > > As far as I can tell, the path isn't added. I also tried using > <dependency> instead of <implicit-dependency> but that didn't help. With the attached patch one can do (tested!): <Jamfile> # ... targets.create-typed-target BOOSTBOOK : [ project.current ] : sample_library_docs : sample_library.qbk ; boostbook sample_main_doc : sample.xml : <implicit-dependency>sample_library_docs ; </Jamfile> <sample.xml> < ... > <xi:include href="sample_library_docs.boostbook"/> < ... > </sample.xml> HTH, João --------------000101030108080403070304 Content-Type: text/x-patch; name="xsltproc.jam.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xsltproc.jam.diff" Index: xsltproc.jam =================================================================== RCS file: /cvsroot/boost/boost/tools/build/v2/tools/xsltproc.jam,v retrieving revision 1.8 diff -u -r1.8 xsltproc.jam --- xsltproc.jam 9 Feb 2005 04:45:00 -0000 1.8 +++ xsltproc.jam 16 Feb 2005 03:14:27 -0000 @@ -12,6 +12,7 @@ import feature ; import regex ; +import sequence ; import common ; feature.feature xsl:param : : free ; @@ -49,6 +50,24 @@ flags += --path $(path:G=) ; } + # Take care of implicit dependencies + local other-deps ; + for local dep in [ feature.get-values <implicit-dependency> : $(properties) ] + { + other-deps += [ $(dep:G=).creating-subvariant ] ; + } + + local implicit-target-directories ; + for local dep in [ sequence.unique $(other-deps) ] + { + implicit-target-directories += [ $(dep).all-target-directories ] ; + } + + for local dir in $(implicit-target-directories) + { + flags += --path $(dir) ; + } + return $(flags) ; } --------------000101030108080403070304--
Boost-Build list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk