From 526511b5f86186473b4818f090ff0ffe2056377b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 8 Aug 2016 11:33:18 -0400 Subject: Support NEWS generation for development trees --- autowaf.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/autowaf.py b/autowaf.py index 3302abf..80940a7 100644 --- a/autowaf.py +++ b/autowaf.py @@ -791,7 +791,7 @@ def run_ldconfig(ctx): except: pass -def write_news(name, in_files, out_file, top_entries=None, extra_entries=None): +def write_news(name, in_files, out_file, top_entries=None, extra_entries=None, dev_dist=None): import rdflib import textwrap from time import strftime, strptime @@ -824,8 +824,14 @@ def write_news(name, in_files, out_file, top_entries=None, extra_entries=None): changeset = m.value(release, dcs.changeset, None) dist = m.value(release, doap['file-release'], None) + if not dist: + dist = dev_dist + if revision and date and blamee and changeset: - entry = '%s (%s) stable;\n' % (name, revision) + if dist == dev_dist: + entry = '%s (%s) unstable;\n' % (name, revision) + else: + entry = '%s (%s) stable;\n' % (name, revision) for i in m.triples([changeset, dcs.item, None]): item = textwrap.wrap(m.value(i[2], rdfs.label, None), width=79) @@ -836,7 +842,7 @@ def write_news(name, in_files, out_file, top_entries=None, extra_entries=None): top_entries[str(dist)] += [ '%s: %s' % (name, '\n '.join(item))] - if extra_entries: + if extra_entries and dist: for i in extra_entries[str(dist)]: entry += '\n * ' + i -- cgit v1.2.1