Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

From: daniel_james_at_[hidden]
Date: 2008-08-12 18:55:26

Author: danieljames
Date: 2008-08-12 18:55:25 EDT (Tue, 12 Aug 2008)
New Revision: 48113
URL: http://svn.boost.org/trac/boost/changeset/48113

Log:
Merge changes required for 1.36 (I think, svn is not being helpful) but stop
short of rebuilding the feeds until the docs are up.

Added:
   website/public_html/live/feed/history/boost_1_36_0.qbk
      - copied unchanged from r48108, /website/public_html/beta/feed/history/boost_1_36_0.qbk
Text files modified:
   website/public_html/live/common/code/boost_archive.php | 29 +++++++++-------------
   website/public_html/live/doc/.htaccess | 2
   website/public_html/live/doc/display_libs.php | 9 ++++--
   website/public_html/live/doc/libraries.xml | 52 +++++++++++++++++++++++++++++++++++++++
   website/public_html/live/feed/build.jam | 2
   5 files changed, 71 insertions(+), 23 deletions(-)

Modified: website/public_html/live/common/code/boost_archive.php
==============================================================================
--- website/public_html/live/common/code/boost_archive.php (original)
+++ website/public_html/live/common/code/boost_archive.php 2008-08-12 18:55:25 EDT (Tue, 12 Aug 2008)
@@ -39,7 +39,7 @@
             array('@.*@','@[.]js$@i','raw','application/x-javascript'),
             array('@.*@','@[.]pdf$@i','raw','application/pdf'),
             array('@.*@','@[.](html|htm)$@i','raw','text/html'),
- array('@.*@','@[^.](Jamroot|Jamfile)$@i','text','text/plain'),
+ array('@.*@','@[^.](Jamroot|Jamfile|ChangeLog)$@i','text','text/plain'),
             ));
         
         $this->version_ = $path_parts[1];
@@ -325,23 +325,18 @@
         }
         
         # nasty code, because (?!fubar) causes an ICE...
- preg_match('@<table_at_i',$text,$table_begin,PREG_OFFSET_CAPTURE);
+ preg_match('@<table[^<>]*>?@i',$text,$table_begin,PREG_OFFSET_CAPTURE);
         preg_match('@</table>@i',$text,$table_end,PREG_OFFSET_CAPTURE);
- if (isset($table_begin[0]) && isset($table_end[0]) &&
- strpos(substr($text,0,$table_end[0][1]),'boost.png',$table_begin[0][1]) !== FALSE)
- {
- $text = substr($text,$table_end[0][1]+strlen($table_end[0][0]));
- }
-
- preg_match('@<h[12]@i',$text,$h1_begin,PREG_OFFSET_CAPTURE);
- preg_match('@</h[12]>@i',$text,$h1_end,PREG_OFFSET_CAPTURE);
- preg_match('@<table_at_i',$text,$table_begin,PREG_OFFSET_CAPTURE);
- preg_match('@</table>@i',$text,$table_end,PREG_OFFSET_CAPTURE);
- if (isset($h1_begin[0]) && isset($table_end[0]) &&
- $table_begin[0][1] < $h1_begin[0][1] && $h1_begin[0][1] < $table_end[0][1]+8)
- {
- $text = substr($text,$h1_begin[0][1],
- $h1_begin[0][1]-$h1_end[0][1]+5) . substr($text,$table_end[0][1]+8);
+ if (isset($table_begin[0]) && isset($table_end[0])) {
+ $table_contents_start = $table_begin[0][1] + strlen($table_begin[0][0]);
+ $table_contents = substr($text, $table_contents_start,
+ $table_end[0][1] - $table_contents_start);
+ if(strpos($table_contents, 'boost.png') !== FALSE) {
+ preg_match('@<td[^<>]*>?([^<]*<(h[12]|p).*?)</td>@is', $table_contents,
+ $table_contents_header, PREG_OFFSET_CAPTURE);
+ $text = (isset($table_contents_header[1]) ? $table_contents_header[1][0] : '').
+ substr($text, $table_end[0][1] + 8);
+ }
         }
         #else
         #{

Modified: website/public_html/live/doc/.htaccess
==============================================================================
--- website/public_html/live/doc/.htaccess (original)
+++ website/public_html/live/doc/.htaccess 2008-08-12 18:55:25 EDT (Tue, 12 Aug 2008)
@@ -16,7 +16,7 @@
 
 #~ # In case we don't get a file looking URI we send it to the index.html file.
 #~ # - With some exceptions.
-RewriteCond %{REQUEST_URI} !^/doc/libs/([0-9_]+)/([^.]*[^./])/(Jamroot|Jamfile)$
+RewriteCond %{REQUEST_URI} !^/doc/libs/([0-9_]+)/([^.]*[^./])/(Jamroot|Jamfile|ChangeLog)$
 RewriteRule ^libs/([0-9_]+)/([^.]*[^./])/?$ libs/$1/$2/index.html [R]
 
 # Rewrite specific versions to the dynamic handlers.

Modified: website/public_html/live/doc/display_libs.php
==============================================================================
--- website/public_html/live/doc/display_libs.php (original)
+++ website/public_html/live/doc/display_libs.php 2008-08-12 18:55:25 EDT (Tue, 12 Aug 2008)
@@ -9,10 +9,10 @@
       '34','35',
       )).')_[0-9]@',
     '@^libs/('.implode('|',array(
- 'algorithm/string','any','array','asio','assign','bind','bimap',
+ 'accumulators','algorithm/string','any','array','asio','assign','bind','bimap',
       'circular_buffer',
       'concept_check','config','date_time','date_time/doc','disjoint_sets',
- 'dynamic_bitset','filesystem','foreach','function','functional/hash',
+ 'dynamic_bitset','exception','filesystem','foreach','function','functional/hash',
       'function_types','fusion','graph','interprocess','intrusive',
       'io','iostreams','iterator','lambda',
       'lambda/doc','math','math/doc','mem_fn','mpl',
@@ -22,7 +22,7 @@
       'python/doc/tutorial','python/doc/v2','regex','serialization','signals',
       'signals/doc','smart_ptr','statechart','static_assert','system','test',
       'thread','thread/doc','tr1','tuple','typeof',
- 'type_traits','variant','xpressive'
+ 'type_traits','units','unordered','variant','xpressive'
       )).')/index.(html|htm)$@i',
     'raw','text/html'),
   //~ special cases that can't be processed at all (some redirects)
@@ -43,6 +43,7 @@
   array('@.*@','@^more/lib_guide.htm$@i','raw','text/html'),
   array('@.*@','@^more/regression.html$@i','raw','text/html'),
   array('@.*@','@^status/index.html$@i','raw','text/html'),
+ array('@.*@','@^tools/boostbook/index.html$@i','raw','text/html'),
   array('@.*@','@^tools/build/index.html$@i','raw','text/html'),
   array('@.*@','@^tools/jam/index.html$@i','raw','text/html'),
   array('@.*@','@^tools/quickbook/index.html$@i','raw','text/html'),
@@ -54,6 +55,8 @@
   array('@.*@','@^libs/system/doc/.*(html|htm)$@i','simple','text/html'),
   array('@.*@','@^libs/numeric/conversion/doc/.*(html|htm)$@i','simple','text/html'),
   array('@.*@','@^libs/optional/doc/.*(html|htm)$@i','simple','text/html'),
+ //~ special cases that look like boost book, but aren't
+ array('@.*@','@^libs/parameter/doc/html/.*(html|htm)$@i','boost_libs_html','text/html'),
   //~ default to processed output for libs and tools
   array('@.*@','@^libs/[^/]+/doc/html/.*(html|htm)$@i','boost_book_html','text/html'),
   array('@.*@','@^libs/[^/]+/doc/[^/]+/html/.*(html|htm)$@i','boost_book_html','text/html'),

Modified: website/public_html/live/doc/libraries.xml
==============================================================================
--- website/public_html/live/doc/libraries.xml (original)
+++ website/public_html/live/doc/libraries.xml 2008-08-12 18:55:25 EDT (Tue, 12 Aug 2008)
@@ -1,5 +1,17 @@
 <boost xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <library>
+ <key>accumulators</key>
+ <boost-version>1.36.0</boost-version>
+ <name>Accumulators</name>
+ <authors>Eric Niebler</authors>
+ <description>Framework for incremental calculation, and collection of statistical accumulators.</description>
+ <documentation>libs/accumulators/index.html</documentation>
+ <std-proposal>false</std-proposal>
+ <std-tr1>false</std-tr1>
+ <header-only>true</header-only>
+ <autolink>false</autolink>
+ </library>
+ <library>
     <key>algorithm/minmax</key>
     <boost-version>1.32.0</boost-version>
     <name>Min-Max</name>
@@ -260,6 +272,20 @@
     <autolink>false</autolink>
   </library>
   <library>
+ <key>exception</key>
+ <boost-version>1.36.0</boost-version>
+ <name>Exception</name>
+ <authors>Emil Dotchevski</authors>
+ <description>The Boost Exception library supports transporting
+ of arbitrary data in exception objects, and transporting of
+ exceptions between threads.</description>
+ <documentation>libs/exception/doc/boost-exception.html</documentation>
+ <std-proposal>false</std-proposal>
+ <std-tr1>false</std-tr1>
+ <header-only>true</header-only>
+ <autolink>false</autolink>
+ </library>
+ <library>
     <key>filesystem</key>
     <boost-version>1.30.0</boost-version>
     <name>Filesystem</name>
@@ -971,7 +997,7 @@
     <authors>Gennadiy Rozental</authors>
     <description>Support for simple program testing, full unit
     testing, and for program execution monitoring.</description>
- <documentation>libs/test/doc/index.html</documentation>
+ <documentation>libs/test/index.html</documentation>
     <std-proposal>false</std-proposal>
     <std-tr1>false</std-tr1>
     <header-only>false</header-only>
@@ -1073,6 +1099,30 @@
     <autolink>false</autolink>
   </library>
   <library>
+ <key>units</key>
+ <boost-version>1.36.0</boost-version>
+ <name>Units</name>
+ <authors>Matthias Schabel and Steven Watanabe</authors>
+ <description>Zero-overhead dimensional analysis and unit/quantity manipulation and conversion.</description>
+ <documentation>libs/units/index.html</documentation>
+ <std-proposal>false</std-proposal>
+ <std-tr1>false</std-tr1>
+ <header-only>true</header-only>
+ <autolink>false</autolink>
+ </library>
+ <library>
+ <key>unordered</key>
+ <boost-version>1.36.0</boost-version>
+ <name>Unordered</name>
+ <authors>Daniel James</authors>
+ <description>Unordered associative containers.</description>
+ <documentation>libs/unordered/index.html</documentation>
+ <std-proposal>false</std-proposal>
+ <std-tr1>true</std-tr1>
+ <header-only>true</header-only>
+ <autolink>false</autolink>
+ </library>
+ <library>
     <key>utility</key>
     <boost-version>1.13.0</boost-version>
     <name>Utility</name>

Modified: website/public_html/live/feed/build.jam
==============================================================================
--- website/public_html/live/feed/build.jam (original)
+++ website/public_html/live/feed/build.jam 2008-08-12 18:55:25 EDT (Tue, 12 Aug 2008)
@@ -58,7 +58,7 @@
 
 path-constant CWD : . ;
 
-make downloads.rss : [ glob-rss history/boost_1_35_0 downloads/* ]
+make downloads.rss : [ glob-rss history/boost_1_36_0 downloads/* ]
     : @rss :
     <title>"Boost Downloads"
     <uri>"http://www.boost.org/feed/download.rss"

Date view Thread view Subject view Author view

Boost-Commit 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