|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r69320 - in website/public_html/live: . common common/code community development doc users
From: dnljms_at_[hidden]
Date: 2011-02-27 05:23:46
Author: danieljames
Date: 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
New Revision: 69320
URL: http://svn.boost.org/trac/boost/changeset/69320
Log:
Merge from beta. Fixes #5200.
Removed:
website/public_html/live/doc/display_jam.php
Properties modified:
website/public_html/live/ (props changed)
Text files modified:
website/public_html/live/.htaccess | 3 -
website/public_html/live/common/code/boost_archive.php | 73 +++++++++++++++++++++++++++++++++++----
website/public_html/live/common/menu-doc.html | 2
website/public_html/live/community/groups.html | 2
website/public_html/live/development/running_regression_tests.html | 3 -
website/public_html/live/doc/.htaccess | 18 ++++-----
website/public_html/live/doc/tools.html | 8 ---
website/public_html/live/users/uses_open.html | 2
8 files changed, 79 insertions(+), 32 deletions(-)
Modified: website/public_html/live/.htaccess
==============================================================================
--- website/public_html/live/.htaccess (original)
+++ website/public_html/live/.htaccess 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
@@ -34,8 +34,7 @@
########## Rewrites to serve up "sub-projects".
-RewriteRule ^boost-build2$ boost-build2/index.html [R]
-RewriteRule ^boost-build2/$ boost-build2/index.html [R]
+RewriteRule ^boost-build2$ boost-build2/ [R]
RewriteRule ^boost-build2/doc/html/bbv2/advanced/(.*)$ boost-build2/doc/html/bbv2/overview/$1 [R]
RewriteRule ^boost-build2/(boost-build[.]tar[.]bz2)$ common/code/boost_download.php/$1 [L]
RewriteRule ^boost-build2/(boost-build[.]zip)$ common/code/boost_download.php/$1 [L]
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 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
@@ -57,14 +57,46 @@
// Check file exists.
- $check_file = $params['zipfile'] ? $params['archive'] : $params['file'];
+ if ($params['zipfile'])
+ {
+ $check_file = $params['archive'];
- if (!is_file($check_file)) {
- file_not_found($params,
- $params['zipfile'] ?
- 'Unable to find zipfile.' :
- 'Unable to find file.');
- return;
+ if (!is_file($check_file)) {
+ file_not_found($params, 'Unable to find zipfile.');
+ return;
+ }
+ }
+ else
+ {
+ $check_file = $params['file'];
+
+ if (is_dir($check_file))
+ {
+ if(substr($check_file, -1) != '/') {
+ $redirect = resolve_url(basename($check_file).'/');
+ header("Location: $redirect", TRUE, 301);
+ return;
+ }
+
+ $found_file = NULL;
+ if (is_file("$check_file/index.html")) $found_file = 'index.html';
+ else if (is_file("$check_file/index.htm")) $found_file = 'index.htm';
+
+ if ($found_file) {
+ $params['file'] = $check_file = $check_file.$found_file;
+ $params['key'] = $params['key'].$found_file;
+ }
+ else {
+ if (!http_headers('text/html', filemtime($check_file), $expires))
+ return;
+
+ return display_dir($params, $check_file);
+ }
+ }
+ else if (!is_file($check_file)) {
+ file_not_found($params, 'Unable to find file.');
+ return;
+ }
}
// Choose filter to use
@@ -79,7 +111,7 @@
array('@.*@','@[.]js$@i','raw','application/x-javascript'),
array('@.*@','@[.]pdf$@i','raw','application/pdf'),
array('@.*@','@[.](html|htm)$@i','raw','text/html'),
- array('@.*@','@[^.](Jamroot|Jamfile|ChangeLog)$@i','text','text/plain'),
+ array('@.*@','@/(Jamroot|Jamfile|ChangeLog|configure)$@i','text','text/plain'),
array('@.*@','@[.]dtd$@i','raw','application/xml-dtd'),
));
@@ -226,6 +258,31 @@
);
}
+function display_dir($params, $dir)
+{
+ $handle = opendir($dir);
+
+ $title = htmlentities("Index listing for $params[key]");
+
+ $params['title'] = $title;
+
+ $content = "<h3>$title</h3>\n<ul>\n";
+
+ while (($file = readdir($handle)) !== false)
+ {
+ if (substr($file, 0, 1) == '.') continue;
+ if (is_dir("$dir$file")) $file .= '/';
+ $file = htmlentities($file);
+ $content .= "<li><a href='$file'>$file</a></li>\n";
+ }
+
+ $content .= "</ul>\n";
+
+ $params['content'] = $content;
+
+ display_template($params['template'], boost_archive_render_callbacks($content, $params));
+}
+
function display_raw_file($params, $type)
{
## header('Content-Disposition: attachment; filename="downloaded.pdf"');
Modified: website/public_html/live/common/menu-doc.html
==============================================================================
--- website/public_html/live/common/menu-doc.html (original)
+++ website/public_html/live/common/menu-doc.html 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
@@ -66,7 +66,7 @@
<a href="/doc/tools.html">Tools <span class="link">></span></a>
<ul>
- <li><a href="/doc/tools/build/index.html">Boost Build <span class=
+ <li><a href="/boost-build2/">Boost Build <span class=
"link">></span></a></li>
<li><a href="/tools/regression/index.html">Regression <span class=
Modified: website/public_html/live/community/groups.html
==============================================================================
--- website/public_html/live/community/groups.html (original)
+++ website/public_html/live/community/groups.html 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
@@ -224,7 +224,7 @@
<h3><a name="jamboost" id="jamboost"></a>Boost.Build list</h3>
- <p>The mailing list for the <a href="../tools/build">Boost
+ <p>The mailing list for the <a href="../boost-build2/">Boost
Build System</a> is located <a href=
"http://lists.boost.org/mailman/listinfo.cgi/boost-build"
class="external">here</a>. GMane provides <a href=
Modified: website/public_html/live/development/running_regression_tests.html
==============================================================================
--- website/public_html/live/development/running_regression_tests.html (original)
+++ website/public_html/live/development/running_regression_tests.html 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
@@ -37,8 +37,7 @@
distribution.</em></strong></p>
<p>To run a library's regression tests, run Boost's <a href=
- "/doc/tools/build/doc/html/jam/usage.html"><tt>bjam</tt></a>
- utility from that library's
+ "/boost-build2/"><tt>bjam</tt></a> utility from that library's
<tt>libs/<em><library></em>/test</tt> directory. To run a
single test, specify its name (as found in Jamfile.v2) on the
command line.</p>
Modified: website/public_html/live/doc/.htaccess
==============================================================================
--- website/public_html/live/doc/.htaccess (original)
+++ website/public_html/live/doc/.htaccess 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
@@ -26,11 +26,6 @@
RewriteRule ^libs/release(/.*)?$ libs/1_46_0$1 [R]
RewriteRule ^libs/development(/.*)?$ libs/1_46_0$1 [R]
-#~ # In case we don't get a file looking URI we send it to the index.html file.
-#~ # - With some exceptions.
-RewriteCond %{REQUEST_URI} !/(Jamroot|Jamfile|ChangeLog)$
-RewriteRule ^libs/([0-9_]+(?:beta[0-9]*)?)/([^.]*[^./])/?$ libs/$1/$2/index.html [R]
-
# Rewrite specific versions to the dynamic handlers.
RewriteRule ^libs/([0-9_]+(?:beta[0-9]*)?)/?$ libraries.php/$1 [L]
@@ -40,9 +35,12 @@
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^libs/?(.*)$ libraries.php$1 [L]
-# Handling of tool documentation.
-RewriteRule ^tools(\.html)?/jam/?$ tools/jam/index.html [R]
-RewriteRule ^tools(\.html)?/jam/(.*) display_jam.php/boost-jam-3.1.18/$2 [L]
-RewriteRule ^tools(\.html)?/build/?$ tools/build/index.html [R]
-RewriteRule ^tools(\.html)?/build/(.*) display_build.php/boost-build/boost-build/$2 [L]
+# Redirect boost build/bjam documentation to new boost build location.
+RewriteRule ^tools(?:\.html)?/jam/jam/(language|miscellaneous|history).html$ /boost-build2/doc/html/jam/$1.html [R=301]
+RewriteRule ^tools(?:\.html)?/jam(/|$) /boost-build2/doc/html/bbv2/jam.html [R=301]
+RewriteRule ^tools(?:\.html)?/build$ /boost-build2/ [R=301]
+RewriteRule ^tools(?:\.html)?/build/(.*) /boost-build2/$1 [R=301]
+
+# Other tools
RewriteRule ^tools(\.html)?/(.*) libs/release/tools/$2 [R]
+
Deleted: website/public_html/live/doc/display_jam.php
==============================================================================
--- website/public_html/live/doc/display_jam.php 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
+++ (empty file)
@@ -1,9 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../common/code/boost_archive.php');
-
-display_from_archive(
- get_archive_location('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],true,false),
- array(
- //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type[,preprocess hook]),
- array('@.*@','@[.](html|htm)$@i','boost_book_html','text/html'),
-));
Modified: website/public_html/live/doc/tools.html
==============================================================================
--- website/public_html/live/doc/tools.html (original)
+++ website/public_html/live/doc/tools.html 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
@@ -39,17 +39,11 @@
applications.</p>
<dl>
- <dt>Boost.Build</dt>
+ <dt>Boost.Build</dt>
<dd>The Boost build system, including the full Boost version
of the jam sources.</dd>
- <dt>Boost.Jam</dt>
-
- <dd>Boost Jam (<tt>bjam</tt>) is the core interpreted tool on
- which the Boost build system is written. This is an evolution
- upon Perforce's Jam language.</dd>
-
<dt>Regression</dt>
<dd>The Boost regression testing system reporting
Modified: website/public_html/live/users/uses_open.html
==============================================================================
--- website/public_html/live/users/uses_open.html (original)
+++ website/public_html/live/users/uses_open.html 2011-02-27 05:23:42 EST (Sun, 27 Feb 2011)
@@ -176,7 +176,7 @@
"../doc/libs/release/libs/asio/index.html">Boost.Asio</a>,
<a href=
"../doc/libs/release/libs/spirit/index.html">Boost.Spirit</a>
- etc); Boost.Build
+ etc); Boost.Build
is used as build system.</p>
<h2>CGAL</h2>
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