Combine all release notes into a single file, just easier to read.

Which when you think about it is the main criteria on which to judge
release notes, right? No text changes beyond removing Sphinx interdoc
links and the :pr: extlinks to Bugzilla.

Remove combine_relnotes.py as this was its last run. The setup for
the website is very broken as a result of this change, that comes next.

2 files changed, 0 insertions, 90 deletions

diff --git a/src/build-data/sphinx/conf.py b/src/build-data/sphinx/conf.py
index 29a1c1fe7..378cfbc65 100644
--- a/src/build-data/sphinx/conf.py
+++ b/src/build-data/sphinx/conf.py
@@ -35,7 +35,6 @@ if is_website_build and use_disqus:
 files_dir = 'http://botan.randombit.net/releases'
 
 extlinks = {
-    'pr': ('http://bugs.randombit.net/show_bug.cgi?id=%s', 'PR '),
     'wikipedia': ('https://en.wikipedia.org/wiki/%s', ''),
     'botan-devel': ('http://lists.randombit.net/pipermail/botan-devel/%s.html', None),
 
diff --git a/src/scripts/combine_relnotes.py b/src/scripts/combine_relnotes.py
deleted file mode 100755
index cf9a78ad7..000000000
--- a/src/scripts/combine_relnotes.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/python
-
-"""
-(C) 2014 Jack Lloyd
-
-Botan is released under the Simplified BSD License (see license.txt)
-"""
-
-import re
-import sys
-import os
-import sys
-
-def open_for_utf8(fsname, mode):
-    if sys.version_info[0] == 3:
-        return open(fsname, mode, encoding='utf-8')
-    else:
-        return open(fsname, mode)
-
-def combine_relnotes(relnote_dir, with_rst_labels):
-
-    relnotes = [p for p in os.listdir(relnote_dir) if p.startswith(('0', '1', '2'))]
-
-    re_version = re.compile('Version (\d+\.\d+\.\d+), ([0-9]{4}-[0-9]{2}-[0-9]{2})$')
-    re_nyr = re.compile('Version (\d+\.\d+\.\d+), Not Yet Released$')
-
-    version_contents = {}
-    version_date = {}
-    versions = []
-    versions_nyr = []
-
-    for f in relnotes:
-        contents = open_for_utf8(os.path.join(relnote_dir, f), 'r').readlines()
-
-        match = re_version.match(contents[0])
-
-        if match:
-            version = match.group(1)
-            date = match.group(2)
-            versions.append(version)
-            version_date[version] = date
-        else:
-            match = re_nyr.match(str(contents[0]))
-            if not match:
-                raise Exception('No version match for %s' % (f))
-
-            version = match.group(1)
-            versions_nyr.append(version)
-
-        version_contents[version] = (''.join(contents)).strip()
-
-    def make_label(v):
-        if with_rst_labels:
-            return ".. _v%s:\n\n" % (v.replace('.', '_'))
-        else:
-            return ''
-
-    s = ''
-
-    s += "Release Notes\n"
-    s += "========================================\n"
-    s += "\n"
-
-    date_to_version = {}
-    for (v,d) in version_date.items():
-        date_to_version.setdefault(d, []).append(v)
-
-    if len(versions_nyr) > 0:
-        for v in versions_nyr:
-            s += make_label(v)
-            s += version_contents[v]
-            s += "\n\n"
-
-    for d in sorted(date_to_version.keys(), reverse=True):
-        for v in sorted(date_to_version[d]):
-            s += make_label(v)
-            s += version_contents[v]
-            s += "\n\n"
-
-    return s
-
-def main(args = None):
-    if args is None:
-        args = sys.argv
-
-    print(combine_relnotes(args[1], True))
-
-if __name__ == '__main__':
-    sys.exit(main())