|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r76762 - in website/public_html/live: . feed feed/history generated generated/state site-tools/boost_site site-tools/templates users/download users/history
From: dnljms_at_[hidden]
Date: 2012-01-28 14:07:00
Author: danieljames
Date: 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
New Revision: 76762
URL: http://svn.boost.org/trac/boost/changeset/76762
Log:
Website: Merge from beta.
Properties modified:
website/public_html/live/ (props changed)
Text files modified:
website/public_html/live/feed/dev.rss | 28 ++++++++++++++--------------
website/public_html/live/feed/history/boost_1_49_0.qbk | 4 ++--
website/public_html/live/generated/home-items.html | 2 +-
website/public_html/live/generated/state/feed-pages.txt | 9 +++++----
website/public_html/live/site-tools/boost_site/boostbook_parser.py | 5 +++++
website/public_html/live/site-tools/boost_site/pages.py | 32 +++++++++++++++++++++++++++-----
website/public_html/live/site-tools/templates/download-template.html | 2 +-
website/public_html/live/site-tools/templates/entry-template.html | 17 +++++------------
website/public_html/live/site-tools/templates/index-src.html | 4 ++--
website/public_html/live/users/download/index.html | 4 +++-
website/public_html/live/users/history/version_1_49_0.html | 37 +++++++++++++++++++------------------
11 files changed, 84 insertions(+), 60 deletions(-)
Modified: website/public_html/live/feed/dev.rss
==============================================================================
--- website/public_html/live/feed/dev.rss (original)
+++ website/public_html/live/feed/dev.rss 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -15,7 +15,7 @@
<ul>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/container/">Container</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/container/">Container</a>:</span>
<ul>
<li>
<div>
@@ -37,7 +37,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/geometry/">Geometry</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/geometry/">Geometry</a>:</span>
<ul>
<li>
<div>
@@ -172,7 +172,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/graph/">Graph</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/graph/">Graph</a>:</span>
<ul>
<li>
<div>
@@ -204,7 +204,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/icl/">Icl</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/icl/">Icl</a>:</span>
<ul>
<li>
<div>
@@ -223,7 +223,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/interprocess/">Interprocess</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/interprocess/">Interprocess</a>:</span>
<ul>
<li>
<div>
@@ -261,7 +261,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/intrusive/">Intrusive</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/intrusive/">Intrusive</a>:</span>
<ul>
<li>
<div>
@@ -275,7 +275,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/conversion/lexical_cast.htm">Lexical cast</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/conversion/lexical_cast.htm">Lexical cast</a>:</span>
<ul>
<li>
<div>
@@ -296,7 +296,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/locale/">Locale</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/locale/">Locale</a>:</span>
<ul>
<li>
<div>
@@ -309,7 +309,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/move/">Move</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/move/">Move</a>:</span>
<ul>
<li>
<div>
@@ -325,7 +325,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/property_tree">PropertyTree</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/property_tree">PropertyTree</a>:</span>
<ul>
<li>
<div>
@@ -343,7 +343,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/spirit/index.html">Spirit</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/spirit/index.html">Spirit</a>:</span>
<ul>
<li>
<div>
@@ -356,7 +356,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/thread">Thread</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/thread">Thread</a>:</span>
<ul>
<li>
<div>
@@ -531,7 +531,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/unordered">Unordered</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/unordered">Unordered</a>:</span>
<ul>
<li>
<div>
@@ -558,7 +558,7 @@
</li>
<li>
<div>
- <span class="library"><a href="http://www.boost.org/libs/uuid/">Uuid</a>:</span>
+ <span class="library"><a href="http://www.boost.org/doc/libs/1_49_0_beta1/libs/uuid/">Uuid</a>:</span>
<ul>
<li>
<div>
Modified: website/public_html/live/feed/history/boost_1_49_0.qbk
==============================================================================
--- website/public_html/live/feed/history/boost_1_49_0.qbk (original)
+++ website/public_html/live/feed/history/boost_1_49_0.qbk 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -11,8 +11,9 @@
[include ext.qbk]
-[status beta]
+[status beta 1]
[download http://sourceforge.net/projects/boost/files/boost/1.49.0.beta.1/]
+[documentation /doc/libs/1_49_0_beta1/]
[section Updated Libraries]
@@ -180,7 +181,6 @@
* [@http://svn.boost.org/trac/boost/ticket/6207 #6207] shared_lock swap compiler error on clang 3.0 c++11.
* [@http://svn.boost.org/trac/boost/ticket/6208 #6208] try_lock_wrapper swap compiler error on clang 3.0 c++11.
-
* [phrase library..[@/libs/unordered Unordered]:]
* On compilers without rvalue references, the containers are no longer
movable by default, as move emulation was causing some odd quirks.
Modified: website/public_html/live/generated/home-items.html
==============================================================================
--- website/public_html/live/generated/home-items.html (original)
+++ website/public_html/live/generated/home-items.html 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -7,7 +7,7 @@
<li><span class="news-title">Version 1.48.0 (release notes)</span><span class="news-date">November 15th, 2011 15:47 GMT</span></li>
</ul><h3>Beta Release</h3>
<ul id="downloads">
-<li><span class="news-title">Version 1.49.0 - beta release (release notes)</span><span class="news-date">In Progress</span></li>
+<li><span class="news-title">Version 1.49.0 beta 1 - beta release (release notes)</span><span class="news-date">In Progress</span></li>
</ul>
<p>More Downloads...
Modified: website/public_html/live/generated/state/feed-pages.txt
==============================================================================
--- website/public_html/live/generated/state/feed-pages.txt (original)
+++ website/public_html/live/generated/state/feed-pages.txt 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -1832,12 +1832,13 @@
(feed/history/boost_1_49_0.qbk
-dir_location
-documentation
+"/doc/libs/1_49_0_beta1/
-download
"http://sourceforge.net/projects/boost/files/boost/1.49.0.beta.1/
-id
"version_1_49_0
-last_modified
-.1327763147.45
+.1327777574.36
-location
"users/history/version_1_49_0.html
-page_state
@@ -1849,11 +1850,11 @@
" Lexical Cast, Locale, Move, Property Tree, Spirit, Thread, Unordered, Uuid.
"
-qbk_hash
-"ef9be42478c225dc778bb7b001c64e9fd6771d23cdccca2572db46506a51cf88
+"1f3eea9443857c84c89e85856a4893f85eab2324b08fde9c44baa266aa2e286b
-release_status
-"beta
+"beta 1
-rss_hash
-"6d95d71bb071208e80ef8e719880a05b6fc0443651af55e556c98281a3944f86
+"bf6f34bf00e1f2c412968d19ec92f9018b2d7a277834398f24fab87f98094e59
-title
"Version 1.49.0
-type
Modified: website/public_html/live/site-tools/boost_site/boostbook_parser.py
==============================================================================
--- website/public_html/live/site-tools/boost_site/boostbook_parser.py (original)
+++ website/public_html/live/site-tools/boost_site/boostbook_parser.py 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -22,6 +22,10 @@
print "Boostbook file not article:", filename
return
+ id = ''
+ if article_node.hasAttribute('id'):
+ id = article_node.getAttribute('id')
+
brief_xhtml = self.new_fragment(
*self.x_children(article_node.getElementsByTagName('articlepurpose')[0])
)
@@ -56,6 +60,7 @@
description_xhtml = self.x(article_node)
return {
+ 'id' : id,
'title_fragment' : title_xhtml,
'purpose_fragment' : brief_xhtml,
'description_fragment' : description_xhtml,
Modified: website/public_html/live/site-tools/boost_site/pages.py
==============================================================================
--- website/public_html/live/site-tools/boost_site/pages.py (original)
+++ website/public_html/live/site-tools/boost_site/pages.py 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -169,16 +169,21 @@
def initialise(self):
self.flags = set()
+ self.full_title_xml = self.title_xml
if self.type == 'release':
if not self.release_status and self.pub_date != 'In Progress':
self.release_status = 'released'
- if self.release_status and self.release_status not in ['released', 'beta']:
+ status_parts = self.release_status.split(' ', 2)
+ if status_parts[0] not in ['released', 'beta']:
print "Error: Unknown release status: " + self.release_status
self.release_status = None
if self.release_status:
- self.flags.add(self.release_status)
-
+ self.flags.add(status_parts[0])
+ if ('beta' in self.flags):
+ self.full_title_xml = self.full_title_xml + ' ' + self.release_status
+ elif ('released' not in self.flags):
+ self.full_title_xml = self.full_title_xml + ' - work in progress'
def state(self):
return {
@@ -204,13 +209,14 @@
self.title_xml = boost_site.util.fragment_to_string(values['title_fragment'])
self.purpose_xml = boost_site.util.fragment_to_string(values['purpose_fragment'])
- self.description_xml = boost_site.util.fragment_to_string(values['description_fragment'])
self.pub_date = values['pub_date']
self.last_modified = values['last_modified']
self.download_item = values['download_item']
self.documentation = values['documentation']
- self.id = re.sub('[\W]', '_', self.title_xml).lower()
+ self.id = values['id']
+ if not self.id:
+ self.id = re.sub('[\W]', '_', self.title_xml).lower()
if self.dir_location:
self.location = self.dir_location + self.id + '.html'
self.dir_location = None
@@ -221,6 +227,22 @@
self.initialise()
+ if 'released' not in self.flags and self.documentation:
+ doc_matcher = re.compile('^/(?:libs/|doc/html/)')
+ doc_prefix = self.documentation.rstrip('/')
+
+
+ for child in values['description_fragment'].childNodes:
+ if child.__class__.__name__ == 'Element':
+ for anchor in child.getElementsByTagName('a'):
+ if anchor.hasAttribute('href') and doc_matcher.match(
+ anchor.getAttribute('href')):
+ anchor.setAttribute('href', doc_prefix +
+ anchor.getAttribute('href'))
+
+
+ self.description_xml = boost_site.util.fragment_to_string(values['description_fragment'])
+
def web_date(self):
if self.pub_date == 'In Progress':
return self.pub_date
Modified: website/public_html/live/site-tools/templates/download-template.html
==============================================================================
--- website/public_html/live/site-tools/templates/download-template.html (original)
+++ website/public_html/live/site-tools/templates/download-template.html 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -44,7 +44,7 @@
emit('<h2 id="%s">%s</h2>' % (x['anchor'], x['label']))
for entry in x['entries']:
emit('\n')
- emit(' <h3><span class=\n "news-title">%s</span></h3>\n\n' % entry.title_xml)
+ emit(' <h3><span class=\n "news-title">%s</span></h3>\n\n' % entry.full_title_xml)
emit(' <p class="news-date">%s</p>\n\n' % entry.web_date())
emit(' <p class="news-description">\n')
emit(' <span class="brief"><span class="purpose">%s</span></span></p>\n\n' % entry.purpose_xml)
Modified: website/public_html/live/site-tools/templates/entry-template.html
==============================================================================
--- website/public_html/live/site-tools/templates/entry-template.html (original)
+++ website/public_html/live/site-tools/templates/entry-template.html 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -1,16 +1,9 @@
-${
-full_title_xml = page.title_xml
-
-if page.type == 'release':
- if ('beta' in page.flags): full_title_xml = full_title_xml + ' - beta release'
- elif ('released' not in page.flags): full_title_xml = full_title_xml + ' - work in progress'
-
-}$<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<!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>
- <title>${ emit(full_title_xml) }$</title>
+ <title>${ emit(page.full_title_xml) }$</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" href="/favicon.ico" type="image/ico" />
<link rel="stylesheet" type="text/css" href="/style-v2/section-boost.css" />
@@ -44,15 +37,15 @@
<div class="section" id="intro">
<div class="section-0">
<div class="section-title">
- <h1>${ emit(full_title_xml) }$</h1>
+ <h1>${ emit(page.title_xml) }$</h1>
</div>
${
-if page.type == 'release' and 'released' not in page.flags and 'beta' not in page.flags:
+if page.type == 'release' and 'released' not in page.flags:
emit('<div class="section-note"><p>Note: This version is at an early stage in its release cycle. The information listed below is incomplete and some of the documentation links may not work yet.</p></div>\n');
}$
<div class="section-body">
<h2><span class=
- "news-title">${ emit(page.title_xml) }$</span></h2>
+ "news-title">${ emit(page.full_title_xml) }$</span></h2>
<p><span class=
"news-date">${ emit(page.web_date()) }$</span></p>
Modified: website/public_html/live/site-tools/templates/index-src.html
==============================================================================
--- website/public_html/live/site-tools/templates/index-src.html (original)
+++ website/public_html/live/site-tools/templates/index-src.html 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -15,7 +15,7 @@
emit('<li><span class="news-title">')
if entry.download_item:
emit('<a href="%s">' % entry.download_item)
- emit(entry.title_xml)
+ emit(entry.full_title_xml)
if ('beta' in entry.flags):
emit(' - beta release')
if entry.download_item:
@@ -36,7 +36,7 @@
${
for entry in news:
emit('\n')
- emit(' <li><span class=\n "news-title">%s</span>\n' % (entry.location, entry.title_xml))
+ emit(' <li><span class=\n "news-title">%s</span>\n' % (entry.location, entry.full_title_xml))
emit(' <span class=\n "news-description"><span class="brief"><span class="purpose">%s</span></span></span>\n' % entry.purpose_xml)
emit(' <span class=\n "news-date">%s</span></li>' % (entry.web_date()))
}$ </ul>
Modified: website/public_html/live/users/download/index.html
==============================================================================
--- website/public_html/live/users/download/index.html (original)
+++ website/public_html/live/users/download/index.html 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -57,7 +57,7 @@
<a href="/doc/libs/1_48_0/">Documentation</a></li>
</ul><h2 id="beta">Beta Release</h2>
<h3><span class=
- "news-title">Version 1.49.0</span></h3>
+ "news-title">Version 1.49.0 beta 1</span></h3>
<p class="news-date">In Progress</p>
@@ -73,6 +73,8 @@
<li>
<a href="http://sourceforge.net/projects/boost/files/boost/1.49.0.beta.1/">Download</a></li>
+ <li>
+ Documentation</li>
</ul>
<h2><a name="history" id="history"></a>Old Boost Releases</h2>
Modified: website/public_html/live/users/history/version_1_49_0.html
==============================================================================
--- website/public_html/live/users/history/version_1_49_0.html (original)
+++ website/public_html/live/users/history/version_1_49_0.html 2012-01-28 14:06:58 EST (Sat, 28 Jan 2012)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>Version 1.49.0 - beta release</title>
+ <title>Version 1.49.0 beta 1</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" href="/favicon.ico" type="image/ico" />
<link rel="stylesheet" type="text/css" href="/style-v2/section-boost.css" />
@@ -32,16 +32,17 @@
<div class="section" id="intro">
<div class="section-0">
<div class="section-title">
- <h1>Version 1.49.0 - beta release</h1>
+ <h1>Version 1.49.0</h1>
</div>
+<div class="section-note"><p>Note: This version is at an early stage in its release cycle. The information listed below is incomplete and some of the documentation links may not work yet.</p></div>
<div class="section-body">
<h2><span class=
- "news-title">Version 1.49.0</span></h2>
+ "news-title">Version 1.49.0 beta 1</span></h2>
<p><span class=
"news-date">In Progress</span></p>
-
+<p>Documentation
<p><span class="news-download">Download this beta release.</span></p>
<div class="news-description">
<div class="description">
@@ -53,7 +54,7 @@
<ul>
<li>
<div>
- <span class="library">Container:</span>
+ <span class="library">Container:</span>
<ul>
<li>
<div>
@@ -75,7 +76,7 @@
</li>
<li>
<div>
- <span class="library">Geometry:</span>
+ <span class="library">Geometry:</span>
<ul>
<li>
<div>
@@ -210,7 +211,7 @@
</li>
<li>
<div>
- <span class="library">Graph:</span>
+ <span class="library">Graph:</span>
<ul>
<li>
<div>
@@ -242,7 +243,7 @@
</li>
<li>
<div>
- <span class="library">Icl:</span>
+ <span class="library">Icl:</span>
<ul>
<li>
<div>
@@ -261,7 +262,7 @@
</li>
<li>
<div>
- <span class="library">Interprocess:</span>
+ <span class="library">Interprocess:</span>
<ul>
<li>
<div>
@@ -299,7 +300,7 @@
</li>
<li>
<div>
- <span class="library">Intrusive:</span>
+ <span class="library">Intrusive:</span>
<ul>
<li>
<div>
@@ -313,7 +314,7 @@
</li>
<li>
<div>
- <span class="library">Lexical cast:</span>
+ <span class="library">Lexical cast:</span>
<ul>
<li>
<div>
@@ -334,7 +335,7 @@
</li>
<li>
<div>
- <span class="library">Locale:</span>
+ <span class="library">Locale:</span>
<ul>
<li>
<div>
@@ -347,7 +348,7 @@
</li>
<li>
<div>
- <span class="library">Move:</span>
+ <span class="library">Move:</span>
<ul>
<li>
<div>
@@ -363,7 +364,7 @@
</li>
<li>
<div>
- <span class="library">PropertyTree:</span>
+ <span class="library">PropertyTree:</span>
<ul>
<li>
<div>
@@ -381,7 +382,7 @@
</li>
<li>
<div>
- <span class="library">Spirit:</span>
+ <span class="library">Spirit:</span>
<ul>
<li>
<div>
@@ -394,7 +395,7 @@
</li>
<li>
<div>
- <span class="library">Thread:</span>
+ <span class="library">Thread:</span>
<ul>
<li>
<div>
@@ -569,7 +570,7 @@
</li>
<li>
<div>
- <span class="library">Unordered:</span>
+ <span class="library">Unordered:</span>
<ul>
<li>
<div>
@@ -596,7 +597,7 @@
</li>
<li>
<div>
- <span class="library">Uuid:</span>
+ <span class="library">Uuid:</span>
<ul>
<li>
<div>
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