Generate separate lists of open and closed issues.

2 files changed, 29 insertions, 8 deletions

diff --git a/tools/build.sh b/tools/build.sh
index 16eb8a2..84511b5 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -54,8 +54,11 @@ do
  $TOOLSDIR/gen-index.py -v "$v" -r "$DESTDIR" -t "$INDEX_TEMPLATE" "$SRCDIR/issues" "$dest"
 done
 
+dest="$DESTDIR/issues-closed.html"
+$TOOLSDIR/gen-index.py -c -v "$DWARF_VERSION" -r "$DESTDIR" -t "$INDEX_TEMPLATE" "$SRCDIR/issues" "$dest"
+
 dest="$DESTDIR/issues.html"
-$TOOLSDIR/gen-index.py -v "$DWARF_VERSION" -r "$DESTDIR" -t "$INDEX_TEMPLATE" "$SRCDIR/issues" "$dest"
+$TOOLSDIR/gen-index.py -o -v "$DWARF_VERSION" -r "$DESTDIR" -t "$INDEX_TEMPLATE" "$SRCDIR/issues" "$dest"
 
 # Hardlink the static files into the build tree
 echo "Hard-linking static files..."
diff --git a/tools/gen-index.py b/tools/gen-index.py
index a1127df..fda3477 100755
--- a/tools/gen-index.py
+++ b/tools/gen-index.py
@@ -37,9 +37,10 @@ issue_column_fields = [
 root_dir = ""
 version = ""
 template_file = ""
+issue_filter = ""
 
 try:
- opts, args = getopt.getopt(sys.argv[1:], "hr:v:t:")
+ opts, args = getopt.getopt(sys.argv[1:], "hcor:v:t:")
 except getopt.GetoptError as err:
  sys.stderr.write(str(err) + "\n")
  usage()
@@ -48,6 +49,10 @@ for o, a in opts:
  if o == "-h":
  usage()
  sys.exit(0)
+ elif o == "-c":
+ issue_filter = "c"
+ elif o == "-o":
+ issue_filter = "o"
  elif o == "-r":
  root_dir = a
  elif o == "-v":
@@ -69,6 +74,10 @@ root_path = os.path.relpath(root_dir, dest_dir)
 title = "DWARF Issues"
 if version:
  title = "Issues for DWARF Version " + version
+if issue_filter == "c":
+ title = "Closed " + title
+elif issue_filter == "o":
+ title = "Open " + title
 
 for f in [source_dir, dest_dir, template_file]:
  if f and not os.path.exists(f):
@@ -90,12 +99,21 @@ for source_file in issue_files:
  m = re.match(r"([^:]+):\s*(.*)", l)
  if m:
  per_file_meta[m.group(1).lower()] = m.group(2)
- if not version or ("version" in per_file_meta and version == per_file_meta["version"]):
- href = os.path.join(root_path, "issues", os.path.basename(source_file.replace(".md", ".html")))
- issue_table += " <tr>\n"
- issue_table += " <td><a href=\"%s\">%s</a></td>\n" % (href, per_file_meta["propid"])
- issue_table += "".join(" <td>%s</td>\n" % html.escape(per_file_meta[s]) for s in issue_column_fields[1:])
- issue_table += " </tr>\n"
+ if version and "version" in per_file_meta and version != per_file_meta["version"]:
+ continue
+ if issue_filter:
+ is_closed = False
+ if "status" in per_file_meta:
+ is_closed = re.match(r"accepted|approved|closed|duplicate|deferred|rejected|withdrawn|lang", per_file_meta["status"], re.I)
+ if issue_filter == "c" and not is_closed:
+ continue
+ if issue_filter == "o" and is_closed:
+ continue
+ href = os.path.join(root_path, "issues", os.path.basename(source_file.replace(".md", ".html")))
+ issue_table += " <tr>\n"
+ issue_table += " <td><a href=\"%s\">%s</a></td>\n" % (href, per_file_meta["propid"])
+ issue_table += "".join(" <td>%s</td>\n" % html.escape(per_file_meta[s]) for s in issue_column_fields[1:])
+ issue_table += " </tr>\n"
 issue_table += "</tbody>\n</table>\n"
 
 with open(template_file, 'r', encoding="utf-8") as f: