Explorar o código

Merge remote-tracking branches 'origin/pr/26' and 'origin/pr/28'

Daniel James %!s(int64=11) %!d(string=hai) anos
pai
achega
a3c32cc7cd
Modificáronse 2 ficheiros con 129 adicións e 39 borrados
  1. 117 23
      doc/pdf/Jamfile.v2
  2. 12 16
      doc/pdf/build

+ 117 - 23
doc/pdf/Jamfile.v2

@@ -35,6 +35,7 @@ install pdf-install
   : 
     array_docs
     any_docs
+    ../../libs/align/doc//standalone
     ../../libs/atomic/doc//standalone
     ../../libs/accumulators/doc//standalone 
     ../../libs/algorithm/string/doc//string_algo 
@@ -44,34 +45,25 @@ install pdf-install
     ../../libs/chrono/doc//standalone
     ../../libs/concept_check/doc//concepts 
     ../../libs/config/doc//standalone 
-    ../../libs/context/doc//standalone
-    #../../libs/container/doc//pdfinstall 
-    ../../libs/conversion/doc//standalone
-    ../../libs/coroutine/doc//standalone
+    ../../libs/context/doc//context
+    ../../libs/core/doc//standalone
     ../../libs/date_time/xmldoc//date_time 
     ../../libs/foreach/doc//standalone 
     ../../libs/function/doc//function-doc 
-    ../../libs/functional/factory/doc//standalone
-    ../../libs/functional/forward/doc//standalone
-    ../../libs/functional/hash/doc//standalone
 #    ../../libs/functional/overloaded_function/doc//doc
     ../../libs/fusion/doc//quickbook
     #../../libs/geometry/doc//geometry
+    ../../libs/heap/doc//standalone
     ../../libs/icl/doc//standalone
     ../../libs/integer/doc//standalone
     ../../libs/iterator/doc//standalone
     ../../libs/lambda/doc//lambda-doc
     ../../libs/lockfree/doc//standalone
+    ../../libs/lexical_cast/doc//standalone
 #    ../../libs/local_function/doc//doc
     ../../libs/logic/doc//tribool
-    ../../libs/math/doc/complex//standalone
-    ../../libs/math/doc/octonion//standalone
-    ../../libs/math/doc/quaternion//standalone
-    ../../libs/math/doc/gcd//standalone
-    ../../libs/math/doc/sf_and_dist//pdfinstall
     ../../libs/move/doc//standalone
     ../../libs/mpi/doc//standalone
-    ../../libs/multiprecision/doc//standalone
     ../../libs/numeric/conversion/doc//standalone
 #    ../../libs/numeric/odeint/doc//standalone
     ../../libs/optional/doc//standalone
@@ -82,12 +74,14 @@ install pdf-install
     # Invalid Jamfile, doesn't use Boostbook anyway??
     #../../libs/ptr_container/doc//standalone
     ../../libs/ratio/doc//standalone
+    ../../libs/random/doc//standalone
     ../../libs/regex/doc//standalone
     ../../libs/signals/doc//doc
     ../../libs/spirit/repository/doc//spirit2_repository
     ../../libs/static_assert/doc//standalone
     ../../libs/thread/doc//standalone
     ../../libs/tr1/doc//standalone
+    ../../libs/type_index/doc//standalone
     ../../libs/type_traits/doc//pdfinstall
     ../../libs/typeof/doc//standalone
     ../../libs/units/doc//standalone
@@ -95,6 +89,10 @@ install pdf-install
     ../../libs/unordered/doc//standalone
     ../../libs/variant/doc//variant-doc
     ../../libs/xpressive/doc//standalone
+    ../../libs/utility/doc//standalone_base_from_member
+    ../../libs/utility/doc//standalone_compressed_pair
+    ../../libs/utility/doc//standalone_declval
+    ../../libs/utility/doc//standalone_string_ref
 
     ../../tools/boostbook/doc//boostbook
     ../../tools/build/doc//jam_docs
@@ -127,16 +125,6 @@ install asio-install
     <name>asio.pdf
   ;
 
-install phoenix-install
-  :
-    ../../libs/spirit/phoenix/doc//quickbook
-  :
-    <location>.
-    <install-type>PDF
-    <format>pdf
-    <name>spirit-phoenix-v2.pdf
-  ;
-
 install boost-build-install
   :
     ../../tools/build/doc//userman
@@ -191,9 +179,115 @@ install scope_exit_install
     <name>scope_exit.pdf
 ;
 
+install math_install
+   :
+       ../../libs/math/doc//standalone
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>math.pdf
+;
+
+install multiprecision_install
+   :
+       ../../libs/multiprecision/doc//standalone
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>multiprecision.pdf
+;
+
+install tti_install
+   :
+           ../../libs/tti/doc//standalone
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>TypeTraitsIntrospection.pdf
+;
+
+install circular_buffer_install
+   :
+           ../../libs/circular_buffer/doc//standalone
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>circular_buffer.pdf
+;
+
+
+install coroutine_install
+   :
+               ../../libs/coroutine/doc//coro
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>coroutine.pdf
+;
+
+install pool_install
+   :
+               ../../libs/pool/doc//standalone
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>pool.pdf
+;
 
+install multi_array_install
+   :
+        ../../libs/multi_array/doc/xml//multi_array-doc
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>multi_array.pdf
+;
 
+install factory_install
+   :
+      ../../libs/functional/factory/doc//standalone
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>functional_factory.pdf
+;
 
+install forward_install
+   :
+      ../../libs/functional/forward/doc//standalone
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>functional_forward.pdf
+;
+
+install hash_install
+   :
+    ../../libs/functional/hash/doc//standalone
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>functional_hash.pdf
+;
 
+install log_install
+   :
+    ../../libs/log/doc//log
+   :
+    <location>.
+    <install-type>PDF
+    <format>pdf
+    <name>log.pdf
+;
 
 

+ 12 - 16
doc/pdf/build

@@ -1,23 +1,19 @@
 #!/bin/bash
 boost_version=$(grep 'define.*BOOST_LIB_VERSION' ../../boost/version.hpp | sed 's/.*"\([^"]*\)".*/\1/')
 echo Boost version tag = $boost_version
-(cd ../../libs/accumulators/doc && bjam -a) 2>&1 | tee build.log
-(cd ../../libs/container/doc && rm -rf *.pdf && bjam -a pdfinstall xsl:param=fop1.extensions=1 &&  cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
-(cd ../../libs/interprocess/doc && rm -rf *.pdf && bjam -a pdfinstall xsl:param=fop1.extensions=1 &&  cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
-(cd ../../libs/intrusive/doc && rm -rf *.pdf && bjam -a pdfinstall xsl:param=fop1.extensions=1 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/accumulators/doc && bjam -a --hash) 2>&1 | tee build.log
+(cd ../../libs/container/doc && rm -rf *.pdf && bjam -a --hash pdfinstall xsl:param=fop1.extensions=1 &&  cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/interprocess/doc && rm -rf *.pdf && bjam -a --hash pdf pdfinstall xsl:param=fop1.extensions=1 &&  cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/intrusive/doc && rm -rf *.pdf && bjam -a --hash pdf pdfinstall xsl:param=fop1.extensions=1 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/functional/overloaded_function/doc && rm -rf *.pdf && bjam -a --hash pdf pdfinstall && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/local_function/doc && rm -rf *.pdf && bjam -a --hash pdf pdfinstall && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/utility/identity_type/doc && rm -rf *.pdf && bjam -a --hash pdf pdf_doc_install && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
+(cd ../../libs/numeric/odeint/doc && rm -rf *.pdf && bjam -a --hash --enable-index pdf pdfinstall && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
 (cd ../../libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk && bjam release) 2>&1 | tee -a build.log
-(cd ../../libs/functional/overloaded_function/doc && rm -rf *.pdf && bjam -a pdfinstall && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
-(cd ../../libs/local_function/doc && rm -rf *.pdf && bjam -a pdfinstall && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
-(cd ../../libs/utility/identity_type/doc && rm -rf *.pdf && bjam -a pdf_doc_install && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
-(cd ../../libs/numeric/odeint/doc && rm -rf *.pdf && bjam -a --hash --enable-index pdfinstall && cp *.pdf ../../../../doc/pdf) 2>&1 | tee -a build.log
-cp ../../dist/bin/doxygen_xml2qbk* /usr/local/bin
-(cd ../../libs/geometry/doc && rm -rf *.pdf && ./make_qbk.py && bjam pdfinstall -a xsl:param=fop1.extensions=1 xsl:param=xep.extensions=0 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
-bjam -a --enable-index pdf -d2 xsl:param=fop1.extensions=0 xsl:param=xep.extensions=1 2>&1 | tee -a build.log
+cp ../../dist/bin/doxygen_xml2qbk* /usr/bin
+chmod +wrx /usr/bin/doxygen_xml2qbk*
+(cd ../../libs/geometry/doc && rm -rf *.pdf && ./make_qbk.py && bjam pdfinstall -a --hash xsl:param=fop1.extensions=1 xsl:param=xep.extensions=0 && cp *.pdf ../../../doc/pdf) 2>&1 | tee -a build.log
+bjam -a --hash --enable-index pdf -d2 xsl:param=fop1.extensions=0 xsl:param=xep.extensions=1 2>&1 | tee -a build.log
 rm -rf boost_${boost_version}_pdf
 mkdir boost_${boost_version}_pdf
 mv *.pdf boost_${boost_version}_pdf
-
-
-
-
-

粤ICP备19079148号