aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-02-16 19:36:13 +0100
committerDavid Robillard <d@drobilla.net>2020-02-16 19:36:13 +0100
commita7a8d43cd191aa0e613164b9fae56165ae9b1f81 (patch)
treebb81a12b3e41453fb66471ca06038cfaa9cdeede
parent62588ec4053322d9706100d26d87c8b2aef17d3e (diff)
downloadlv2-a7a8d43cd191aa0e613164b9fae56165ae9b1f81.tar.xz
Update autowaf
m---------waflib0
-rw-r--r--wscript110
2 files changed, 61 insertions, 49 deletions
diff --git a/waflib b/waflib
-Subproject c87cc53c643c60867665b333d5999fe07196d54
+Subproject 697d367fc93bffe5bdf542e5ae8f8919d83fefd
diff --git a/wscript b/wscript
index b54aacc..678e9b0 100644
--- a/wscript
+++ b/wscript
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import os
+import re
import sys
from waflib import Context, Logs, Options, Scripting, Utils
@@ -12,6 +13,11 @@ VERSION = '1.17.0' # Package version for waf dist
top = '.' # Source directory
out = 'build' # Build directory
+# Release variables
+uri = 'http://lv2plug.in/ns/lv2'
+dist_pattern = 'http://lv2plug.in/spec/lv2-%d.%d.%d.tar.bz2'
+post_tags = []
+
# Map of specification base name to old URI-style include path
spec_map = {
'atom' : 'lv2/lv2plug.in/ns/ext/atom',
@@ -480,63 +486,69 @@ class DistCheck(Dist, Scripting.DistCheck):
def archive(self):
Dist.archive(self)
+def _get_news_entries(ctx):
+ from waflib.extras import autoship
+
+ # Get project-level news entries
+ lv2_entries = autoship.read_ttl_news('lv2',
+ ['lv2/core/meta.ttl',
+ 'lv2/core/people.ttl'],
+ dist_pattern = dist_pattern)
+
+ release_pattern = r'http://lv2plug.in/spec/lv2-([0-9\.]*).tar.bz2'
+ current_version = sorted(lv2_entries.keys(), reverse=True)[0]
+
+ # Add items from every specification
+ for specdir in specdirs(ctx.path):
+ name = os.path.basename(specdir.abspath())
+ entries = autoship.read_ttl_news(name, ttl_files(ctx.path, specdir))
+
+ def add_items(lv2_version, name, items):
+ for item in items:
+ lv2_entries[lv2_version]["items"] += ["%s: %s" % (name, item)]
+
+ if entries and name != "core":
+ latest_revision = sorted(entries.keys(), reverse=True)[0]
+ for revision, entry in entries.items():
+ if "dist" in entry:
+ match = re.match(release_pattern, entry["dist"])
+ if match:
+ # Append news items to corresponding LV2 version
+ version = tuple(map(int, match.group(1).split('.')))
+ add_items(version, name, entry["items"])
+
+ elif revision == latest_revision:
+ # Dev version that isn't in a release yet, append to current
+ add_items(current_version, name, entry["items"])
+
+ # Sort news items in each versions
+ for revision, entry in lv2_entries.items():
+ entry["items"].sort()
+
+ return lv2_entries
+
def posts(ctx):
"generates news posts in Pelican Markdown format"
- subdirs = specdirs(ctx.path)
- dev_dist = 'http://lv2plug.in/spec/lv2-%s.tar.bz2' % VERSION
+
+ from waflib.extras import autoship
try:
os.mkdir(os.path.join(out, 'posts'))
except:
pass
- # Get all entries (as in dist())
- top_entries = {}
- for specdir in subdirs:
- entries = autowaf.get_rdf_news(os.path.basename(specdir.abspath()),
- ttl_files(ctx.path, specdir),
- top_entries,
- dev_dist = dev_dist)
-
- entries = autowaf.get_rdf_news('lv2',
- ['lv2/core/meta.ttl',
- 'lv2/core/people.ttl'],
- None,
- top_entries,
- dev_dist = dev_dist)
-
- autowaf.write_posts(entries,
- {'Author': 'drobilla'},
- os.path.join(out, 'posts'))
+ autoship.write_posts(_get_news_entries(ctx),
+ os.path.join(out, 'posts'),
+ {'Author': 'drobilla'})
+
+def news(ctx):
+ """write an amalgamated NEWS file to the source directory"""
+
+ from waflib.extras import autoship
+
+ autoship.write_news(_get_news_entries(ctx), 'NEWS')
def dist(ctx):
- subdirs = specdirs(ctx.path)
- dev_dist = 'http://lv2plug.in/spec/lv2-%s.tar.bz2' % VERSION
-
- # Write NEWS files in source directory
- top_entries = {}
- for specdir in subdirs:
- entries = autowaf.get_rdf_news(os.path.basename(specdir.abspath()),
- ttl_files(ctx.path, specdir),
- top_entries,
- dev_dist = dev_dist)
- autowaf.write_news(entries, specdir.abspath() + '/NEWS')
-
- # Write top level amalgamated NEWS file
- entries = autowaf.get_rdf_news('lv2',
- ['lv2/core/meta.ttl',
- 'lv2/core/people.ttl'],
- None,
- top_entries,
- dev_dist = dev_dist)
- autowaf.write_news(entries, 'NEWS')
-
- # Build archive
+ news(ctx)
ctx.archive()
-
- # Delete generated NEWS files from source directory
- for i in subdirs + [ctx.path]:
- try:
- os.remove(os.path.join(i.abspath(), 'NEWS'))
- except:
- pass
+ os.remove('NEWS')