Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

From: grafikrobot_at_[hidden]
Date: 2007-12-04 15:42:09

Author: grafik
Date: 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
New Revision: 41700
URL: http://svn.boost.org/trac/boost/changeset/41700

Log:
Add tools subsection to documentation. And add display of tools distribution archive docs.
Added:
   website/public_html/beta/doc/display_build.php (contents, props changed)
   website/public_html/beta/doc/display_jam.php (contents, props changed)
   website/public_html/beta/doc/display_libs.php
      - copied, changed from r41651, /website/public_html/beta/doc/display.php
   website/public_html/beta/doc/tools.html
      - copied, changed from r41651, /website/public_html/beta/doc/_template_.html
Removed:
   website/public_html/beta/doc/display.php
Text files modified:
   website/public_html/beta/common/code/archive_file.php | 41 ++++++++++++++-------------------------
   website/public_html/beta/common/code/boost_config.php | 2
   website/public_html/beta/common/menu-doc.html | 11 ++++++++++
   website/public_html/beta/development/testing_results.php | 6 +---
   website/public_html/beta/doc/.htaccess | 9 ++++++-
   website/public_html/beta/doc/display_libs.php | 20 ++++++++++++++----
   website/public_html/beta/doc/tools.html | 4 +-
   7 files changed, 53 insertions(+), 40 deletions(-)

Modified: website/public_html/beta/common/code/archive_file.php
==============================================================================
--- website/public_html/beta/common/code/archive_file.php (original)
+++ website/public_html/beta/common/code/archive_file.php 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
@@ -19,37 +19,26 @@
     function archive_file(
         $pattern,
         $vpath,
+ $content_map = array(),
         $get_as_raw = false,
         $archive_subdir = true,
- $archive_prefix = ARCHIVE_PREFIX,
+ $archive_dir = ARCHIVE_DIR,
         $archive_file_prefix = ARCHIVE_FILE_PREFIX)
     {
         $path_parts = array();
         preg_match($pattern, $vpath, $path_parts);
         
- /*static*/ $info_map = NULL;
- if ($info_map == NULL)
- {
- $info_map = array(
- array('@^libs/iostreams/doc/.*(html|htm)$@i','raw','text/html'),
- array('@^libs/preprocessor/doc\.*(html|htm)$@i','raw','text/html'),
- array('@^libs/serialization/doc/.*(html|htm)$@i','raw','text/html'),
- ##array('@^libs/serialization/doc/index.html$@i','boost_frame1_html','text/html'),
- array('@^libs/preprocessor/doc/.*(html|htm)$@i','raw','text/html'),
- array('@^libs.*(html|htm)$@i','boost_libs_html','text/html'),
- array('@^doc/html/.*html$@i','boost_book_html','text/html'),
- array('@^boost/.*$@i','text','text/plain'),
- array('@[.](txt|py|rst)$@i','text','text/plain'),
- array('@[.](cpp|hpp)$@i','cpp','text/plain'),
- array('@[.]png$@i','raw','image/png'),
- array('@[.]gif$@i','raw','image/gif'),
- array('@[.](jpg|jpeg|jpe)$@i','raw','image/jpeg'),
- array('@[.]css$@i','raw','text/css'),
- array('@[.]js$@i','raw','application/x-javascript'),
- array('@[.]pdf$@i','raw','application/pdf'),
- array('@[.](html|htm)$@i','raw','text/html'),
- );
- }
+ $info_map = array_merge($content_map, array(
+ array('@[.](txt|py|rst)$@i','text','text/plain'),
+ array('@[.](cpp|hpp)$@i','cpp','text/plain'),
+ array('@[.]png$@i','raw','image/png'),
+ array('@[.]gif$@i','raw','image/gif'),
+ array('@[.](jpg|jpeg|jpe)$@i','raw','image/jpeg'),
+ array('@[.]css$@i','raw','text/css'),
+ array('@[.]js$@i','raw','application/x-javascript'),
+ array('@[.]pdf$@i','raw','application/pdf'),
+ array('@[.](html|htm)$@i','raw','text/html'),
+ ));
         
         $this->key_ = $path_parts[2];
         if ($archive_subdir)
@@ -60,7 +49,7 @@
         {
             $this->file_ = $archive_file_prefix . $path_parts[2];
         }
- $this->archive_ = str_replace('\\','/', $archive_prefix . $path_parts[1] . '.zip');
+ $this->archive_ = str_replace('\\','/', $archive_dir . '/' . $path_parts[1] . '.zip');
         
         foreach ($info_map as $i)
         {
@@ -130,7 +119,7 @@
     {
         header('Content-type: '.$this->type_);
         ## header('Content-Disposition: attachment; filename="downloaded.pdf"');
- $file_handle = popen($unzip,'r');
+ $file_handle = popen($unzip,'rb');
         fpassthru($file_handle);
         pclose($file_handle);
     }

Modified: website/public_html/beta/common/code/boost_config.php
==============================================================================
--- website/public_html/beta/common/code/boost_config.php (original)
+++ website/public_html/beta/common/code/boost_config.php 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
@@ -46,7 +46,7 @@
   break;
 }
 
-define('ARCHIVE_FILE_PREFIX', 'boost_');
+define('ARCHIVE_FILE_PREFIX', '');
 
 require_once(BOOST_CONFIG_FILE);
 

Modified: website/public_html/beta/common/menu-doc.html
==============================================================================
--- website/public_html/beta/common/menu-doc.html (original)
+++ website/public_html/beta/common/menu-doc.html 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
@@ -22,4 +22,15 @@
         "link">&gt;</span></a></li>
       </ul>
     </li>
+
+ <li>
+ Tools >
+
+ <ul>
+ <li><a href="/doc/tools/jam/index.html">Boost Jam <span class=
+ "link">&gt;</span></a></li>
+ <li><a href="/doc/tools/build/index.html">Boost Build <span class=
+ "link">&gt;</span></a></li>
+ </ul>
+ </li>
   </ul>

Modified: website/public_html/beta/development/testing_results.php
==============================================================================
--- website/public_html/beta/development/testing_results.php (original)
+++ website/public_html/beta/development/testing_results.php 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
@@ -2,10 +2,8 @@
 require_once(dirname(__FILE__) . '/../common/code/archive_file.php');
 
 $_file = new archive_file(
- '/^[\/]([^\/]+)[\/](.*)$/',$_SERVER["PATH_INFO"],
+ '/^[\/]([^\/]+)[\/](.*)$/',$_SERVER["PATH_INFO"],array(),
   true, // we always want raw output
   false, // the result zips don't have the tag subdir
- RESULTS_DIR."/",
- ""
- );
+ RESULTS_DIR);
 ?>

Modified: website/public_html/beta/doc/.htaccess
==============================================================================
--- website/public_html/beta/doc/.htaccess (original)
+++ website/public_html/beta/doc/.htaccess 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
@@ -9,9 +9,14 @@
 RewriteRule ^libs/development/(.*) libs/1_35_0/$1 [R]
 
 # In case we don't get a file looking URI we send it to the index.html file.
-RewriteRule ^libs/([0-9_]+)/([^.]+)/?$ libs/$1/$2/index.html [R]
+RewriteRule ^libs/([0-9_]+)/([^.]+)/?$ libs/boost_$1/$2/index.html [R]
 
 # Rewrite specific versions to the dynamic handlers.
 RewriteRule ^libs/([0-9_]+)/?$ libraries.php/$1 [L]
-RewriteRule ^libs/([0-9_]+)/(.+)$ display.php/$1/$2 [L]
+RewriteRule ^libs/([0-9_]+)/(.+)$ display_libs.php/boost_$1/$2 [L]
 RewriteRule ^libs/?(.*)$ libraries.php$1 [L]
+
+# Handling of tool documentation.
+RewriteRule ^tools(\.html)?/jam/(.*) display_jam.php/boost-jam-3.1.16/$2 [L]
+RewriteRule ^tools(\.html)?/build/(.*) display_build.php/boost-build-nightly/boost-build/$2 [L]
+RewriteRule ^tools/(.*) libs/release/tools/$1 [R]

Deleted: website/public_html/beta/doc/display.php
==============================================================================
--- website/public_html/beta/doc/display.php 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
+++ (empty file)
@@ -1,69 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../common/code/archive_file.php');
-
-$_file = new archive_file('/^[\/]([^\.\/]+)[\/](.*)$/',$_SERVER["PATH_INFO"]);
-
-if (!$_file->is_raw()) { #~ require_once(dirname(__FILE__) . '/../common/code/webnotes.php');
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
- <?php $_file->content_head(); ?>
- <link rel="icon" href="/favicon.ico" type="image/ico" />
- <link rel="stylesheet" type="text/css" href="/style/section-doc.css" />
- <!--[if IE]> <style type="text/css"> body { behavior: url(/style/csshover.htc); } </style> <![endif]-->
- <?php #~ pwn_head(); ?>
-</head>
-
-<body>
- <div id="heading">
- <?php virtual("/common/heading.html");?>
- </div>
-
- <div id="body">
- <div id="body-inner">
- <div id="content">
- <div class="section" id="docs">
- <div class="section-0">
- <div class="section-body">
- <?php $_file->content(); ?>
- </div>
- </div>
- </div>
-
- <div class="section" id="notes">
- <div class="section-0">
- <div class="section-body">
- <?php #~ pwn_body($_file->key_,$_SERVER['PHP_SELF']); ?>
- </div>
- </div>
- </div>
- </div>
-
- <div class="clear"></div>
- </div>
- </div>
-
- <div id="footer">
- <div id="footer-left">
- <div id="revised">
- <p>Revised $Date$</p>
- </div>
-
- <div id="copyright">
- <p>Copyright Beman Dawes, David Abrahams, 1998-2005.</p>
-
- <p>Copyright Rene Rivera 2004-2005.</p>
- </div><?php virtual("/common/footer-license.html");?>
- </div>
-
- <div id="footer-right">
- <?php virtual("/common/footer-banners.html");?>
- </div>
-
- <div class="clear"></div>
- </div><?php } ?>
-</body>
-</html>

Added: website/public_html/beta/doc/display_build.php
==============================================================================
--- (empty file)
+++ website/public_html/beta/doc/display_build.php 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
@@ -0,0 +1,79 @@
+<?php
+require_once(dirname(__FILE__) . '/../common/code/archive_file.php');
+
+$_file = new archive_file('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],array(
+ array('@^boost-build/index[.]html$@i','boost_libs_html','text/html'),
+ array('@[.](html|htm)$@i','boost_book_html','text/html')
+ ),false,false);
+
+if (!$_file->is_raw()) {
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+ <?php $_file->content_head(); ?>
+ <link rel="icon" href="/favicon.ico" type="image/ico" />
+ <link rel="stylesheet" type="text/css" href="/style/section-doc.css" />
+ <!--[if IE]> <style type="text/css"> body { behavior: url(/style/csshover.htc); } </style> <![endif]-->
+ <?php #~ pwn_head(); ?>
+ <style type="text/css">
+/*<![CDATA[*/
+ div.sidebar {
+ margin-left: 1em ;
+ border: medium outset ;
+ padding: 0em 1em ;
+ background-color: #adbed2;
+ border-color: #000000;
+ border-width: 1;
+ width: 40% ;
+ float: right ;
+ clear: right }
+ /*]]>*/
+ </style>
+
+</head><!-- <?php print $_file->file_; ?> -->
+
+<body>
+ <div id="heading">
+ <?php virtual("/common/heading.html");?>
+ </div>
+
+ <div id="body">
+ <div id="body-inner">
+ <div id="content">
+ <div class="section" id="docs">
+ <div class="section-0">
+ <div class="section-body">
+ <?php $_file->content(); ?>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="clear"></div>
+ </div>
+ </div>
+
+ <div id="footer">
+ <div id="footer-left">
+ <div id="revised">
+ <p>Revised $Date$</p>
+ </div>
+
+ <div id="copyright">
+ <p>Copyright Beman Dawes, David Abrahams, 1998-2005.</p>
+
+ <p>Copyright Rene Rivera 2004-2007.</p>
+ </div><?php virtual("/common/footer-license.html");?>
+ </div>
+
+ <div id="footer-right">
+ <?php virtual("/common/footer-banners.html");?>
+ </div>
+
+ <div class="clear"></div>
+ </div>
+</body>
+</html><?php } ?>
\ No newline at end of file

Added: website/public_html/beta/doc/display_jam.php
==============================================================================
--- (empty file)
+++ website/public_html/beta/doc/display_jam.php 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
@@ -0,0 +1,72 @@
+<?php
+require_once(dirname(__FILE__) . '/../common/code/archive_file.php');
+
+$_file = new archive_file('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],array(
+ array('@[.](html|htm)$@i','boost_book_html','text/html'),
+ ));
+
+if (!$_file->is_raw()) { #~ require_once(dirname(__FILE__) . '/../common/code/webnotes.php');
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+ <?php $_file->content_head(); ?>
+ <link rel="icon" href="/favicon.ico" type="image/ico" />
+ <link rel="stylesheet" type="text/css" href="/style/section-doc.css" />
+ <!--[if IE]> <style type="text/css"> body { behavior: url(/style/csshover.htc); } </style> <![endif]-->
+ <?php #~ pwn_head(); ?>
+
+</head><!-- <?php print $_file->file_; ?> -->
+
+<body>
+ <div id="heading">
+ <?php virtual("/common/heading.html");?>
+ </div>
+
+ <div id="body">
+ <div id="body-inner">
+ <div id="content">
+ <div class="section" id="docs">
+ <div class="section-0">
+ <div class="section-body">
+ <?php $_file->content(); ?>
+ </div>
+ </div>
+ </div>
+
+ <div class="section" id="notes">
+ <div class="section-0">
+ <div class="section-body">
+ <?php #~ pwn_body($_file->key_,$_SERVER['PHP_SELF']); ?>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="clear"></div>
+ </div>
+ </div>
+
+ <div id="footer">
+ <div id="footer-left">
+ <div id="revised">
+ <p>Revised $Date$</p>
+ </div>
+
+ <div id="copyright">
+ <p>Copyright Beman Dawes, David Abrahams, 1998-2005.</p>
+
+ <p>Copyright Rene Rivera 2004-2005.</p>
+ </div><?php virtual("/common/footer-license.html");?>
+ </div>
+
+ <div id="footer-right">
+ <?php virtual("/common/footer-banners.html");?>
+ </div>
+
+ <div class="clear"></div>
+ </div>
+</body>
+</html><?php } ?>
\ No newline at end of file

Copied: website/public_html/beta/doc/display_libs.php (from r41651, /website/public_html/beta/doc/display.php)
==============================================================================
--- /website/public_html/beta/doc/display.php (original)
+++ website/public_html/beta/doc/display_libs.php 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
@@ -1,7 +1,16 @@
 <?php
 require_once(dirname(__FILE__) . '/../common/code/archive_file.php');
 
-$_file = new archive_file('/^[\/]([^\.\/]+)[\/](.*)$/',$_SERVER["PATH_INFO"]);
+$_file = new archive_file('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],array(
+ array('@^libs/iostreams/doc/.*(html|htm)$@i','raw','text/html'),
+ array('@^libs/preprocessor/doc\.*(html|htm)$@i','raw','text/html'),
+ array('@^libs/serialization/doc/.*(html|htm)$@i','raw','text/html'),
+ //~ array('@^libs/serialization/doc/index.html$@i','boost_frame1_html','text/html'),
+ //~ array('@^libs/preprocessor/doc/.*(html|htm)$@i','boost_frame1_html','text/html'),
+ array('@^libs.*(html|htm)$@i','boost_libs_html','text/html'),
+ array('@^doc/html/.*html$@i','boost_book_html','text/html'),
+ array('@^boost/.*$@i','text','text/plain')
+ ));
 
 if (!$_file->is_raw()) { #~ require_once(dirname(__FILE__) . '/../common/code/webnotes.php');
 ?>
@@ -15,7 +24,8 @@
   <link rel="stylesheet" type="text/css" href="/style/section-doc.css" />
   <!--[if IE]> <style type="text/css"> body { behavior: url(/style/csshover.htc); } </style> <![endif]-->
   <?php #~ pwn_head(); ?>
-</head>
+
+</head><!-- <?php print $_file->file_; ?> -->
 
 <body>
   <div id="heading">
@@ -55,7 +65,7 @@
       <div id="copyright">
         <p>Copyright Beman Dawes, David Abrahams, 1998-2005.</p>
 
- <p>Copyright Rene Rivera 2004-2005.</p>
+ <p>Copyright Rene Rivera 2004-2007.</p>
       </div><?php virtual("/common/footer-license.html");?>
     </div>
 
@@ -64,6 +74,6 @@
     </div>
 
     <div class="clear"></div>
- </div><?php } ?>
+ </div>
 </body>
-</html>
+</html><?php } ?>
\ No newline at end of file

Copied: website/public_html/beta/doc/tools.html (from r41651, /website/public_html/beta/doc/_template_.html)
==============================================================================
--- /website/public_html/beta/doc/_template_.html (original)
+++ website/public_html/beta/doc/tools.html 2007-12-04 15:42:08 EST (Tue, 04 Dec 2007)
@@ -3,7 +3,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
- <title>Boost C++ Libraries</title>
+ <title>Boost Tools</title>
   <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
   <link rel="icon" href="/favicon.ico" type="image/ico" />
   <link rel="stylesheet" type="text/css" href="/style/section-doc.css" />
@@ -21,7 +21,7 @@
         <div class="section" id="intro">
           <div class="section-0">
             <div class="section-title">
- <h1>Boost C++ Libraries</h1>
+ <h1>Boost Tools</h1>
             </div>
 
             <div class="section-body">

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