diff --git a/feed/ext.qbk b/feed/ext.qbk
index 25af5b1f..20860d32 100644
--- a/feed/ext.qbk
+++ b/feed/ext.qbk
@@ -25,6 +25,10 @@ Distributed under the Boost Software License, Version 1.0.
]
[template download[link]'''''']
+[/ download_basename[basename]
+]
+[template download_basename[basename]'''''']
+
[/ documentation[link]
Indicate the documentation link of a download or news item.
]
diff --git a/feed/history/boost_1_56_0.qbk b/feed/history/boost_1_56_0.qbk
index 2eabe68f..2a89dd75 100644
--- a/feed/history/boost_1_56_0.qbk
+++ b/feed/history/boost_1_56_0.qbk
@@ -24,6 +24,14 @@
[status beta]
[download http://sourceforge.net/projects/boost/files/boost/1.56.0.beta.1/]
[documentation /doc/libs/1_56_0_b1/]
+[download_basename boost-1_56_0_b1]
+
+[section Other Downloads]
+
+* [@https://sourceforge.net/projects/boost/files/boost-binaries/1.56.0.beta.1/
+ Windows binaries]
+
+[endsect]
[section Modularization]
diff --git a/generated/dev.rss b/generated/dev.rss
index 624d5308..a5e3c41c 100644
--- a/generated/dev.rss
+++ b/generated/dev.rss
@@ -11,6 +11,17 @@
+ <div id="version_1_56_0.other_downloads">
+ <h3><span class="link">Other Downloads</span></h3>
+ <ul>
+ <li>
+ <div>
+ <a href="https://sourceforge.net/projects/boost/files/boost-binaries/1.56.0.beta.1/">Windows
+ binaries</a>
+ </div>
+ </li>
+ </ul>
+ </div>
<div id="version_1_56_0.modularization">
<h3><span class="link">Modularization</span></h3>
<p>
diff --git a/generated/state/feed-pages.txt b/generated/state/feed-pages.txt
index 2d1ad17d..4095c6dd 100644
--- a/generated/state/feed-pages.txt
+++ b/generated/state/feed-pages.txt
@@ -3,6 +3,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost-jam/3.1.18/
+-download_basename
-id
"boost_jam_3_1_18
-last_modified
@@ -35,6 +36,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_10_3
-last_modified
@@ -64,6 +66,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_10_4
-last_modified
@@ -92,6 +95,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_11_0
-last_modified
@@ -121,6 +125,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_11_1
-last_modified
@@ -149,6 +154,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_11_2
-last_modified
@@ -177,6 +183,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_12_0
-last_modified
@@ -205,6 +212,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_13_0
-last_modified
@@ -233,6 +241,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_14_0
-last_modified
@@ -261,6 +270,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_14_1
-last_modified
@@ -290,6 +300,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_14_2
-last_modified
@@ -318,6 +329,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_14_3
-last_modified
@@ -346,6 +358,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_15_0
-last_modified
@@ -374,6 +387,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_15_1
-last_modified
@@ -402,6 +416,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_16_0
-last_modified
@@ -431,6 +446,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_16_1
-last_modified
@@ -459,6 +475,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_17_0
-last_modified
@@ -488,6 +505,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_18_0
-last_modified
@@ -517,6 +535,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_18_1
-last_modified
@@ -545,6 +564,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_18_2
-last_modified
@@ -574,6 +594,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_18_3
-last_modified
@@ -602,6 +623,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_19_0
-last_modified
@@ -631,6 +653,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_20_0
-last_modified
@@ -659,6 +682,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_20_1
-last_modified
@@ -688,6 +712,7 @@
-documentation
-download
"http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=8041&release_id=138112
+-download_basename
-id
"version_1_20_2
-last_modified
@@ -717,6 +742,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_21_0
-last_modified
@@ -747,6 +773,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.21.1/
+-download_basename
-id
"version_1_21_1
-last_modified
@@ -776,6 +803,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.21.2/
+-download_basename
-id
"version_1_21_2
-last_modified
@@ -805,6 +833,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.22.0/
+-download_basename
-id
"version_1_22_0
-last_modified
@@ -834,6 +863,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.23.0/
+-download_basename
-id
"version_1_23_0
-last_modified
@@ -864,6 +894,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.24.0/
+-download_basename
-id
"version_1_24_0
-last_modified
@@ -893,6 +924,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.25.0/
+-download_basename
-id
"version_1_25_0
-last_modified
@@ -923,6 +955,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.25.1/
+-download_basename
-id
"version_1_25_1
-last_modified
@@ -952,6 +985,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.26.0/
+-download_basename
-id
"version_1_26_0
-last_modified
@@ -982,6 +1016,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.27.0/
+-download_basename
-id
"version_1_27_0
-last_modified
@@ -1012,6 +1047,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.28.0/
+-download_basename
-id
"version_1_28_0
-last_modified
@@ -1042,6 +1078,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.29.0/
+-download_basename
-id
"version_1_29_0
-last_modified
@@ -1072,6 +1109,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.30.0/
+-download_basename
-id
"version_1_30_0
-last_modified
@@ -1101,6 +1139,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"version_1_30_1
-last_modified
@@ -1131,6 +1170,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.30.2/
+-download_basename
-id
"version_1_30_2
-last_modified
@@ -1161,6 +1201,7 @@
"/doc/libs/1_31_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.31.0/
+-download_basename
-id
"version_1_31_0
-last_modified
@@ -1193,6 +1234,7 @@
"/doc/libs/1_32_1/
-download
"http://sourceforge.net/projects/boost/files/boost/1.32.0/
+-download_basename
-id
"version_1_32_0
-last_modified
@@ -1224,6 +1266,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.33.0/
+-download_basename
-id
"version_1_33_0
-last_modified
@@ -1256,6 +1299,7 @@
"/doc/libs/1_33_1/
-download
"http://sourceforge.net/projects/boost/files/boost/1.33.1/
+-download_basename
-id
"version_1_33_1
-last_modified
@@ -1287,6 +1331,7 @@
"/doc/libs/1_34_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.34.0/
+-download_basename
-id
"version_1_34_0
-last_modified
@@ -1320,6 +1365,7 @@
"/doc/libs/1_34_1/
-download
"http://sourceforge.net/projects/boost/files/boost/1.34.1/
+-download_basename
-id
"version_1_34_1
-last_modified
@@ -1350,6 +1396,7 @@
"/doc/libs/1_35_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.35.0/
+-download_basename
-id
"version_1_35_0
-last_modified
@@ -1383,6 +1430,7 @@
"/doc/libs/1_36_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.36.0/
+-download_basename
-id
"version_1_36_0
-last_modified
@@ -1415,6 +1463,7 @@
"/doc/libs/1_37_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.37.0/
+-download_basename
-id
"version_1_37_0
-last_modified
@@ -1446,6 +1495,7 @@
"/doc/libs/1_38_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.38.0/
+-download_basename
-id
"version_1_38_0
-last_modified
@@ -1480,6 +1530,7 @@
"/doc/libs/1_39_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.39.0/
+-download_basename
-id
"version_1_39_0
-last_modified
@@ -1512,6 +1563,7 @@
"/doc/libs/1_40_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.40.0/
+-download_basename
-id
"version_1_40_0
-last_modified
@@ -1544,6 +1596,7 @@
"/doc/libs/1_41_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.41.0/
+-download_basename
-id
"version_1_41_0
-last_modified
@@ -1578,6 +1631,7 @@
"/doc/libs/1_42_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.42.0/
+-download_basename
-id
"version_1_42_0
-last_modified
@@ -1610,6 +1664,7 @@
"/doc/libs/1_43_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.43.0/
+-download_basename
-id
"version_1_43_0
-last_modified
@@ -1643,6 +1698,7 @@
"/doc/libs/1_44_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.44.0/
+-download_basename
-id
"version_1_44_0
-last_modified
@@ -1676,6 +1732,7 @@
"/doc/libs/1_45_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.45.0/
+-download_basename
-id
"version_1_45_0
-last_modified
@@ -1707,6 +1764,7 @@
-documentation
-download
"http://sourceforge.net/projects/boost/files/boost/1.46.0/
+-download_basename
-id
"version_1_46_0
-last_modified
@@ -1740,6 +1798,7 @@
"/doc/libs/1_46_1/
-download
"http://sourceforge.net/projects/boost/files/boost/1.46.1/
+-download_basename
-id
"version_1_46_1
-last_modified
@@ -1771,6 +1830,7 @@
"/doc/libs/1_47_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.47.0/
+-download_basename
-id
"version_1_47_0
-last_modified
@@ -1804,6 +1864,7 @@
"/doc/libs/1_48_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.48.0/
+-download_basename
-id
"version_1_48_0
-last_modified
@@ -1836,6 +1897,7 @@
"/doc/libs/1_49_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.49.0/
+-download_basename
-id
"version_1_49_0
-last_modified
@@ -1868,6 +1930,7 @@
"/doc/libs/1_50_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.50.0/
+-download_basename
-id
"version_1_50_0
-last_modified
@@ -1902,6 +1965,7 @@
"/doc/libs/1_51_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.51.0/
+-download_basename
-id
"version_1_51_0
-last_modified
@@ -1934,6 +1998,7 @@
"/doc/libs/1_52_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.52.0/
+-download_basename
-id
"version_1_52_0
-last_modified
@@ -1969,6 +2034,7 @@
"/doc/libs/1_53_0/
-download
"https://sourceforge.net/projects/boost/files/boost/1.53.0/
+-download_basename
-id
"version_1_53_0
-last_modified
@@ -2003,6 +2069,7 @@
"/doc/libs/1_54_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.54.0/
+-download_basename
-id
"version_1_54_0
-last_modified
@@ -2038,6 +2105,7 @@
"/doc/libs/1_55_0/
-download
"http://sourceforge.net/projects/boost/files/boost/1.55.0/
+-download_basename
-id
"version_1_55_0
-last_modified
@@ -2073,10 +2141,12 @@
"/doc/libs/1_56_0_b1/
-download
"http://sourceforge.net/projects/boost/files/boost/1.56.0.beta.1/
+-download_basename
+"boost-1_56_0_b1
-id
"version_1_56_0
-last_modified
-.1405697395.68
+.1405791115.29
-location
"users/history/version_1_56_0.html
-notice
@@ -2094,7 +2164,7 @@
" Libraries: TR1
"
-qbk_hash
-"6bdfed7fe5195af26972366f9f3f4aa1090b3d69b62842827a78882f18d1ba79
+"6e7c4d538ca1f15049bf300ebbe7171acd4b9e74446a2e13e58acc5c727e8981
-release_status
"beta
-title
@@ -2106,6 +2176,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"old_versions
-last_modified
@@ -2134,6 +2205,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"boost_locale_security_notice
-last_modified
@@ -2161,6 +2233,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"old_compilers
-last_modified
@@ -2188,6 +2261,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"a_special_note_for_boost_1_52_0_and_higher
-last_modified
@@ -2215,6 +2289,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"asio_formal_review_begins
-last_modified
@@ -2244,6 +2319,7 @@
-dir_location
-documentation
-download
+-download_basename
-id
"website_1_0_launch
-last_modified
diff --git a/generated/state/rss-items.txt b/generated/state/rss-items.txt
index 238bda5c..7be54b36 100644
--- a/generated/state/rss-items.txt
+++ b/generated/state/rss-items.txt
@@ -22225,6 +22225,17 @@
"
"
"
+" <div id="version_1_56_0.other_downloads">
+" <h3><span class="link">Other Downloads</span></h3>
+" <ul>
+" <li>
+" <div>
+" <a href="https://sourceforge.net/projects/boost/files/boost-binaries/1.56.0.beta.1/">Windows
+" binaries</a>
+" </div>
+" </li>
+" </ul>
+" </div>
" <div id="version_1_56_0.modularization">
" <h3><span class="link">Modularization</span></h3>
" <p>
@@ -23884,7 +23895,7 @@
" </div>
"
-last_modified
-.1405697395.68
+.1405790982.44
-quickbook
"feed/history/boost_1_56_0.qbk
)
diff --git a/site-tools/boost_site/boostbook_parser.py b/site-tools/boost_site/boostbook_parser.py
index c48d5acb..248883c3 100755
--- a/site-tools/boost_site/boostbook_parser.py
+++ b/site-tools/boost_site/boostbook_parser.py
@@ -46,6 +46,11 @@ class BoostBookParser:
if download_node:
download_item = self.get_child(download_node[0]).data
+ download_basename = None
+ download_basename_node = article_node.getElementsByTagName('download_basename')
+ if download_basename_node:
+ download_basename = self.get_child(download_basename_node[0]).data
+
documentation = None
documentation_node = article_node.getElementsByTagName('documentation')
if documentation_node:
@@ -76,6 +81,7 @@ class BoostBookParser:
'pub_date' : pub_date,
'last_modified' : last_modified,
'download_item' : download_item,
+ 'download_basename' : download_basename,
'documentation' : documentation,
'status_item' : status_item
}
@@ -108,6 +114,8 @@ class BoostBookParser:
continue
if self.get_child(body_item, tag = 'download'):
continue
+ if self.get_child(body_item, tag = 'download_basename'):
+ continue
if self.get_child(body_item, tag = 'status'):
continue
if self.get_child(body_item, tag = 'notice'):
diff --git a/site-tools/boost_site/pages.py b/site-tools/boost_site/pages.py
index b321b099..ba9e8783 100755
--- a/site-tools/boost_site/pages.py
+++ b/site-tools/boost_site/pages.py
@@ -169,6 +169,7 @@ class Page:
self.last_modified = attrs.get('last_modified')
self.pub_date = attrs.get('pub_date')
self.download_item = attrs.get('download')
+ self.download_basename = attrs.get('download_basename')
self.documentation = attrs.get('documentation')
self.qbk_hash = attrs.get('qbk_hash')
@@ -211,6 +212,7 @@ class Page:
'last_modified': self.last_modified,
'pub_date': self.pub_date,
'download': self.download_item,
+ 'download_basename': self.download_basename,
'documentation': self.documentation,
'qbk_hash': self.qbk_hash
}
@@ -228,6 +230,7 @@ class Page:
self.pub_date = values['pub_date']
self.last_modified = values['last_modified']
self.download_item = values['download_item']
+ self.download_basename = values['download_basename']
self.documentation = values['documentation']
self.id = values['id']
if not self.id:
@@ -266,31 +269,40 @@ class Page:
return ''
if self.type == 'release' and ('beta' not in self.flags and 'released' not in self.flags):
return ''
-
- match = re.match('.*/boost/(\d+)\.(\d+)\.(\d+)/', self.download_item)
- if(match):
- major = int(match.group(1))
- minor = int(match.group(2))
- point = int(match.group(3))
- base_name = 'boost_' + match.group(1) + '_' + match.group(2) + '_' + match.group(3)
-
- # Pick which files are available by examining the version number.
- # This could possibly be meta-data in the rss feed instead of being
- # hardcoded here.
-
- # TODO: Key order hardcoded later.
-
+
+ downloads = None
+
+ if self.download_basename:
downloads = {
- 'unix' : [base_name + '.tar.bz2', base_name + '.tar.gz'],
- 'windows' : []
+ 'unix' : [self.download_basename + '.tar.bz2', self.download_basename + '.tar.gz'],
+ 'windows' : [self.download_basename + '.7z', self.download_basename + '.zip']
}
+ else:
+ match = re.match('.*/boost/(\d+)\.(\d+)\.(\d+)/', self.download_item)
+ if(match):
+ major = int(match.group(1))
+ minor = int(match.group(2))
+ point = int(match.group(3))
+ base_name = 'boost_' + match.group(1) + '_' + match.group(2) + '_' + match.group(3)
- if(major == 1 and minor >= 32 and minor <= 33):
- downloads['windows'].append(base_name + '.exe')
- elif(major > 1 or minor > 34 or (minor == 34 and point == 1)):
- downloads['windows'].append(base_name + '.7z')
- downloads['windows'].append(base_name + '.zip')
-
+ # Pick which files are available by examining the version number.
+ # This could possibly be meta-data in the rss feed instead of being
+ # hardcoded here.
+
+ # TODO: Key order hardcoded later.
+
+ downloads = {
+ 'unix' : [base_name + '.tar.bz2', base_name + '.tar.gz'],
+ 'windows' : []
+ }
+
+ if(major == 1 and minor >= 32 and minor <= 33):
+ downloads['windows'].append(base_name + '.exe')
+ elif(major > 1 or minor > 34 or (minor == 34 and point == 1)):
+ downloads['windows'].append(base_name + '.7z')
+ downloads['windows'].append(base_name + '.zip')
+
+ if downloads is not None:
# Print the download table.
output = ''
diff --git a/users/history/version_1_56_0.html b/users/history/version_1_56_0.html
index 15d7eb11..1bad801e 100644
--- a/users/history/version_1_56_0.html
+++ b/users/history/version_1_56_0.html
@@ -41,12 +41,25 @@
In Progress
Documentation
-
Download this beta release.
+