aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-11-20 17:52:04 +0000
committerDavid Robillard <d@drobilla.net>2011-11-20 17:52:04 +0000
commit6d87e825340ca813c6a95c42aadb48dfee6452f9 (patch)
treee22013b25e36e0f62b994a13664553ae3a1cd654
parent3dd648663b5d7c469ccedbb2cf521dc466ceadaa (diff)
downloadlv2-6d87e825340ca813c6a95c42aadb48dfee6452f9.tar.xz
Upgrade to waf 1.6.9.
Fix distcheck for extensions without DOAP files.
-rw-r--r--ext.wscript24
-rwxr-xr-xwafbin89897 -> 90869 bytes
2 files changed, 14 insertions, 10 deletions
diff --git a/ext.wscript b/ext.wscript
index 7a9908f..7795eb4 100644
--- a/ext.wscript
+++ b/ext.wscript
@@ -128,7 +128,13 @@ def write_news(doap_file):
rdf = rdflib.Namespace('http://www.w3.org/1999/02/22-rdf-syntax-ns#')
m = rdflib.ConjunctiveGraph()
- m.parse(doap_file, format='n3')
+
+ try:
+ m.parse(doap_file, format='n3')
+ except:
+ print('warning: no DOAP file found, unable to generate NEWS')
+ return
+
spec = m.value(None, rdf.type, doap.Project)
entries = {}
@@ -162,7 +168,7 @@ class Dist(Scripting.Dist):
fun = 'dist'
cmd = 'dist'
- def tar_file_name(self, node):
+ def get_tar_path(self, node):
"Resolve symbolic links to avoid broken links in tarball."
return os.path.realpath(node.abspath())
@@ -175,19 +181,17 @@ class Dist(Scripting.Dist):
lv2extinfo_py.close()
# Write NEWS file
- write_news(info.NAME + '-doap.ttl')
+ write_news('lv2-%s.doap.ttl' % info.NAME)
# Build distribution
Scripting.Dist.archive(self)
# Delete generated files from source tree
- try:
- os.remove('NEWS')
- os.remove('lv2extinfo.py')
- os.remove('lv2extinfo.pyc')
- except Exception as e:
- print "error cleaning:", e
- pass
+ for i in ['NEWS', 'lv2extinfo.py', 'lv2extinfo.pyc']:
+ try:
+ os.remove(i)
+ except:
+ pass
class DistCheck(Dist, Scripting.DistCheck):
fun = 'distcheck'
diff --git a/waf b/waf
index b00be89..ab81022 100755
--- a/waf
+++ b/waf
Binary files differ