Entering 'libs/accumulators' Entering 'libs/algorithm' Entering 'libs/align' Entering 'libs/any' Entering 'libs/array' Entering 'libs/asio' Entering 'libs/assert' Entering 'libs/assign' Entering 'libs/atomic' Entering 'libs/bimap' Entering 'libs/bind' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 978b370..682ce2e 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -3,7 +3,7 @@ # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -project boost/doc ; +project bind/doc ; import boostbook : boostbook ; boostbook ref-doc : ref.xml Entering 'libs/chrono' Entering 'libs/circular_buffer' diff --git a/doc/jamfile.v2 b/doc/jamfile.v2 index 75ce749..bdc1659 100644 --- a/doc/jamfile.v2 +++ b/doc/jamfile.v2 @@ -11,7 +11,7 @@ path-constant nav_images : html/images/ ; # png and svg images for home, next, note, tip... path-constant images_location : html/images ; # location of my SVG and PNG images referenced by Quickbook. -path-constant pdf_images_location : html ; # location of SVG and PNG images referenced by pdf. +path-constant pdf_images_location : .. ; # location of SVG and PNG images referenced by pdf. path-constant here : . ; # location of /doc folder. # echo "nav_images = " $(nav_images) ; # "nav_images = I:\boost-trunk\libs\circular_buffer\doc\html\images @@ -181,14 +181,15 @@ boostbook standalone # Set these one for PDF generation *only*: # default png graphics are awful in PDF form, # better use SVG instead: - #pdf:admon.graphics.extension=".svg" - pdf:admon.graphics.extension=".png" # Only png images are available. - pdf:admon.graphics.path=$(nav_images)/ # next, prev, note, tip ... for pdf. + pdf:admon.graphics.extension=".svg" + #pdf:admon.graphics.extension=".png" # Only png images are available. + # Don't need this, default path works OK: + #pdf:admon.graphics.path=$(nav_images)/ # next, prev, note, tip ... for pdf. pdf:use.role.for.mediaobject=1 pdf:preferred.mediaobject.role=print - pdf:img.src.path=$(pdf_images_location)/ # graphics (diagrams) for pdf. + pdf:img.src.path=$(pdf_images_location)/ # graphics (diagrams) for pdf. pdf:draft.mode="no" - pdf:boost.url.prefix=../../../.. + pdf:boost.url.prefix=../../../.. autodoc # png_install @@ -205,7 +206,7 @@ install png_install : [ glob $(here)/*.png ] : $(here)/../../../doc/ht # because a modified pdf file is created, so this command # will rename the file to the expected filename, here circular_buffer.pdf. -install pdf-install : standalone : PDF . circular_buffer.pdf ; +install pdfinstall : standalone : PDF . circular_buffer.pdf ; Entering 'libs/compatibility' Entering 'libs/concept_check' Entering 'libs/config' Entering 'libs/container' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 2c0b382..f185ef8 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -12,7 +12,7 @@ import quickbook ; using auto-index ; -path-constant images_location : html ; +path-constant images_location : ../ ; path-constant here : . ; doxygen autodoc Entering 'libs/context' Entering 'libs/conversion' Entering 'libs/core' Entering 'libs/coroutine' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index f02d4d4..ff28385 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -9,6 +9,8 @@ import boostbook ; import quickbook ; import modules ; +path-constant here : . ; + boostbook coro : coro.qbk @@ -26,4 +28,6 @@ boostbook coro toc.max.depth=3 # How far down we go with TOC's generate.section.toc.level=10 + # Absolute path for images: + pdf:img.src.path=$(here)/html/ ; Entering 'libs/crc' Entering 'libs/date_time' Entering 'libs/detail' Entering 'libs/disjoint_sets' Entering 'libs/dynamic_bitset' Entering 'libs/exception' Entering 'libs/filesystem' Entering 'libs/flyweight' Entering 'libs/foreach' Entering 'libs/format' Entering 'libs/function' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 1aee1e7..a0f5e0d 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -3,7 +3,7 @@ # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -project boost/doc ; +project function/doc ; import boostbook : boostbook ; boostbook function-doc Entering 'libs/function_types' Entering 'libs/functional' Entering 'libs/fusion' Entering 'libs/geometry' diff --git a/doc/html/index.html b/doc/html/index.html index 841fbf5..b685634 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -3,7 +3,7 @@ Chapter 1. Geometry - + @@ -48,7 +48,7 @@

Table of Contents

-
+
Introduction
Compilation
Design Rationale
@@ -131,7 +131,7 @@
- +

Last revised: July 17, 2014 at 20:45:09 GMT

Last revised: August 14, 2014 at 08:48:25 GMT


warning: LF will be replaced by CRLF in doc/html/index.html. The file will have its original line endings in your working directory. Entering 'libs/gil' Entering 'libs/graph' Entering 'libs/graph_parallel' Entering 'libs/heap' Entering 'libs/icl' Entering 'libs/integer' Entering 'libs/interprocess' Entering 'libs/intrusive' Entering 'libs/io' Entering 'libs/iostreams' Entering 'libs/iterator' Entering 'libs/lambda' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 1723bb7..b731f59 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -1,4 +1,4 @@ -project boost/doc ; +project lambda/doc ; import boostbook : boostbook ; # Are these really the correct images?? Entering 'libs/lexical_cast' Entering 'libs/local_function' Entering 'libs/locale' Entering 'libs/lockfree' Entering 'libs/log' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 5dc18ac..bfbee14 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -263,3 +263,5 @@ boostbook log ; install html/images/log : [ glob *.png ] ; + +install pdfinstall : log : PDF . log.pdf ; Entering 'libs/logic' Entering 'libs/math' Entering 'libs/move' Entering 'libs/mpi' Entering 'libs/mpl' Entering 'libs/msm' Entering 'libs/multi_array' diff --git a/doc/xml/Jamfile.v2 b/doc/xml/Jamfile.v2 index ea7be9d..78a7d01 100644 --- a/doc/xml/Jamfile.v2 +++ b/doc/xml/Jamfile.v2 @@ -6,11 +6,14 @@ project boost/doc ; import boostbook : boostbook ; +path-constant here : . ; + boostbook multi_array-doc : bbref.xml : boost.root=../../../../.. pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html + pdf:img.src.path=$(here)/../ ; Entering 'libs/multi_index' Entering 'libs/multiprecision' Entering 'libs/numeric/conversion' Entering 'libs/numeric/interval' Entering 'libs/numeric/odeint' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 3ca8aa1..4d7ca18 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -10,6 +10,7 @@ using quickbook ; using boostbook ; using doxygen ; import modules ; +path-constant here : . ; project : requirements $(BOOST_ROOT)/tools/auto_index/include @@ -227,9 +228,9 @@ boostbook standalone pdf:admon.graphics.extension=".svg" # pdf:use.role.for.mediaobject=1 # Use print role on next line. pdf:preferred.mediaobject.role=print # pdf role is to be printed. - pdf:img.src.path=$(images_location)/ # Path of image (.svg) files. (Note trailing /) ? - pdf:admon.graphics.path=$(nav_images)/ # path to admonition (warning, note...) image (.svg) files. - pdf:draft.mode="yes" # Yes if draft watermark wanted! + pdf:img.src.path=$(here)/html/ # Path of image (.svg) files. (Note trailing /) ? + #pdf:admon.graphics.path=$(nav_images)/ # path to admonition (warning, note...) image (.svg) files. + #pdf:draft.mode="yes" # Yes if draft watermark wanted! #pdf:draft.watermark.image="draft.png" # Watermark (local copy). #pdf:draft.watermark.image=http://docbook.sourceforge.net/release/images/draft.png # Watermark. @@ -271,7 +272,7 @@ boostbook standalone # will rename the file to the expected filename, here quick_auto_dox_index.pdf. # . means installed in same place as this jamfile, /doc. -install pdf-install : standalone : PDF . checks.pdf ; +install pdfinstall : standalone : PDF . odeint.pdf ; install callouts : [ glob src/images/callouts/*.png ] : html/images/callouts ; Entering 'libs/numeric/ublas' Entering 'libs/optional' Entering 'libs/parameter' Entering 'libs/phoenix' Entering 'libs/polygon' Entering 'libs/pool' diff --git a/doc/jamfile.v2 b/doc/jamfile.v2 index f93d2de..1100299 100644 --- a/doc/jamfile.v2 +++ b/doc/jamfile.v2 @@ -7,7 +7,7 @@ # # See http://www.boost.org for updates, documentation, and revision history. -path-constant boost-root : [ modules.peek : BOOST ] ; +path-constant boost_root : ../../.. ; path-constant images_location : images ; # location of SVG and PNG images referenced by Quickbook. import modules ; @@ -42,7 +42,7 @@ doxygen autodoc "boost.doxygen.reftitle=Boost.Pool C++ Reference" ; -xml pool : pool.qbk : $(boost-root)/tools/auto_index/include ; +xml pool : pool.qbk : $(boost_root)/tools/auto_index/include ; boostbook standalone : Entering 'libs/predef' Entering 'libs/preprocessor' Entering 'libs/program_options' Entering 'libs/property_map' Entering 'libs/property_tree' Entering 'libs/proto' Entering 'libs/ptr_container' Entering 'libs/python' Entering 'libs/random' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 88f4c6e..7e41d94 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -14,6 +14,8 @@ import regex ; import os ; import path ; +path-constant here : . ; + doxygen_files = additive_combine bernoulli_distribution @@ -168,4 +170,5 @@ boostbook standalone : reference boost.root=../../../.. chunk.section.depth=2 + pdf:img.src.path=$(here)/html/ ; Entering 'libs/range' Entering 'libs/ratio' Entering 'libs/rational' Entering 'libs/regex' Entering 'libs/scope_exit' Entering 'libs/serialization' Entering 'libs/signals' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index b35882a..5f18de8 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -1,4 +1,4 @@ -project boost/doc ; +project signals/doc ; import boostbook : boostbook ; boostbook doc Entering 'libs/signals2' Entering 'libs/smart_ptr' Entering 'libs/spirit' Entering 'libs/statechart' Entering 'libs/static_assert' Entering 'libs/system' Entering 'libs/test' Entering 'libs/thread' Entering 'libs/throw_exception' Entering 'libs/timer' Entering 'libs/tokenizer' Entering 'libs/tr1' Entering 'libs/tti' Entering 'libs/tuple' Entering 'libs/type_erasure' Entering 'libs/type_index' Entering 'libs/type_traits' Entering 'libs/typeof' Entering 'libs/units' Entering 'libs/unordered' Entering 'libs/utility' Entering 'libs/uuid' Entering 'libs/variant' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index d3af731..d026b7a 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -1,4 +1,4 @@ -project boost/doc ; +project variant/doc ; import boostbook : boostbook ; boostbook variant-doc Entering 'libs/wave' Entering 'libs/winapi' Entering 'libs/xpressive' Entering 'tools/auto_index' Entering 'tools/bcp' Entering 'tools/boostbook' diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 6c468cb..d09d3de 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -4,7 +4,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -project boost/doc ; +project boostbook/doc ; import boostbook : boostbook ; boostbook boostbook : boostbook.xml : diff --git a/xsl/fo.xsl b/xsl/fo.xsl index 88bacee..622e01c 100644 --- a/xsl/fo.xsl +++ b/xsl/fo.xsl @@ -216,7 +216,7 @@ - text-align + Entering 'tools/boostdep' Entering 'tools/build' diff --git a/src/build/targets.jam b/src/build/targets.jam index 3bd39a3..44c8fc9 100644 --- a/src/build/targets.jam +++ b/src/build/targets.jam @@ -394,7 +394,7 @@ class project-target : abstract-target if ! [ path.is-rooted $(project-part) ] { local rooted = [ path.root $(project-part) / ] ; - if [ project.is-registered-id $(rooted) ] + if $(rooted) && [ project.is-registered-id $(rooted) ] { extra-error-message += - possibly missing a leading slash ('/') character. ; @@ -830,6 +830,10 @@ rule resolve-reference ( target-reference : project ) # Separate target name from properties override. local split = [ MATCH "^([^<]*)(/(<.*))?$" : $(target-reference) ] ; local id = $(split[1]) ; + if ! $(split) || ! $(id) + { + error "Malformed target reference $(target-reference)" ; + } local sproperties = ; if $(split[3]) { Entering 'tools/inspect' Entering 'tools/litre' Entering 'tools/quickbook'