Release preparation.

7 files changed, 71 insertions, 46 deletions

diff --git a/ext.wscript b/ext.wscript
index 7795eb4..276bee9 100644
--- a/ext.wscript
+++ b/ext.wscript
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
+import glob
 import os
-import sys
 import shutil
+import sys
 from waflib.extras import autowaf as autowaf
 import waflib.Scripting as Scripting
 import waflib.Logs as Logs
@@ -116,7 +117,7 @@ def build(bld):
         bld.symlink_as(os.path.join(include_dir, info.NAME),
                        os.path.relpath(bundle_dir, include_dir))
 
-def write_news(doap_file):
+def write_news():
     import rdflib
     import textwrap
     from time import strftime, strptime
@@ -130,9 +131,10 @@ def write_news(doap_file):
     m = rdflib.ConjunctiveGraph()
 
     try:
-        m.parse(doap_file, format='n3')
-    except:
-        print('warning: no DOAP file found, unable to generate NEWS')
+        for i in glob.glob('*.ttl'):
+            m.parse(i, format='n3')
+    except Exception as e:
+        print('warning: error parsing data, unable to generate NEWS ' + str(e))
         return
 
     spec = m.value(None, rdf.type, doap.Project)
@@ -181,7 +183,7 @@ class Dist(Scripting.Dist):
         lv2extinfo_py.close()
 
         # Write NEWS file
-        write_news('lv2-%s.doap.ttl' % info.NAME)
+        write_news()
 
         # Build distribution
         Scripting.Dist.archive(self)
diff --git a/lv2/ns/ext/dynmanifest/dynmanifest.ttl b/lv2/ns/ext/dynmanifest/dynmanifest.ttl
index d48208c..330f143 100644
--- a/lv2/ns/ext/dynmanifest/dynmanifest.ttl
+++ b/lv2/ns/ext/dynmanifest/dynmanifest.ttl
@@ -23,22 +23,7 @@
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
 
 <http://lv2plug.in/ns/ext/dynmanifest>
-	a doap:Project ,
-		lv2:Specification ;
-	doap:license <http://opensource.org/licenses/isc-license> ;
-	doap:name "LV2 Dynamic Manifest" ;
-	doap:homepage <http://naspro.atheme.org> ;
-	doap:created "2009-06-13" ;
-	doap:shortdesc "An LV2-based specification for dynamic data generation." ;
-	doap:programming-language "C" ;
-	doap:release [
-		doap:revision "1.2" ;
-		doap:created "2011-11-20"
-	] ;
-	doap:maintainer [
-		a foaf:Person ;
-		foaf:name "Stefano D'Angelo"
-	] ;
+	a lv2:Specification ;
     lv2:documentation """
 <p>The LV2 API, on its own, cannot be used to write plugin libraries where data
 is dynamically generated at runtime (e.g. API wrappers), since LV2 requires
diff --git a/lv2/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl b/lv2/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl
index f47c381..4b6e017 100644
--- a/lv2/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl
+++ b/lv2/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl
@@ -16,14 +16,14 @@
 	doap:name "LV2 Dynamic Manifest" ;
 	doap:homepage <http://naspro.atheme.org> ;
 	doap:created "2009-06-13" ;
-	doap:shortdesc "An LV2-based specification for dynamic data generation." ;
+	doap:shortdesc "Support for dynamic data generation." ;
 	doap:programming-language "C" ;
 	doap:developer [
 		a foaf:Person ;
 		foaf:name "Stefano D'Angelo"
 	] ;
 	doap:release [
-		doap:revision "1.1" ;
+		doap:revision "1.2" ;
 		doap:created "2011-11-17" ;
 		dcs:blame <http://drobilla.net/drobilla#me> ;
 		dcs:changeset [
diff --git a/lv2/ns/ext/uri-map/uri-map.ttl b/lv2/ns/ext/uri-map/uri-map.ttl
index b0a5399..2b35ba9 100644
--- a/lv2/ns/ext/uri-map/uri-map.ttl
+++ b/lv2/ns/ext/uri-map/uri-map.ttl
@@ -13,6 +13,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+@prefix dcs:   <http://ontologi.es/doap-changeset#> .
 @prefix doap:  <http://usefulinc.com/ns/doap#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
 @prefix lv2:   <http://lv2plug.in/ns/lv2core#> .
@@ -22,6 +23,17 @@
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix umap:  <http://lv2plug.in/ns/ext/uri-map#> .
 
+<http://drobilla.net/drobilla#me>
+	a foaf:Person ;
+	foaf:name "David Robillard" ;
+	foaf:homepage <http://drobilla.net/> ;
+	foaf:mbox <mailto:d@drobilla.net> ;
+	rdfs:seeAlso <http://drobilla.net/drobilla> .
+
+_:larsl
+	a foaf:Person ;
+	foaf:name "Lars Luthman" .
+
 <http://lv2plug.in/ns/ext/uri-map>
 	a lv2:Specification ,
 		lv2:Feature ;
@@ -31,17 +43,16 @@
 	doap:shortdesc "A feature for mapping URIs to integers." ;
 	doap:release [
 		doap:revision "1.2" ;
-		doap:created "2011-05-26"
-	] ;
-	doap:maintainer [
-		a foaf:Person ;
-		foaf:name "David Robillard" ;
-		foaf:homepage <http://drobilla.net/> ;
-		rdfs:seeAlso <http://drobilla.net/drobilla.xrdf>
-	] , [
-		a foaf:Person ;
-		foaf:name "Lars Luthman"
+		doap:created "2011-05-26" ;
+		dcs:blame <http://drobilla.net/drobilla#me> ;
+		dcs:changeset [
+			dcs:item [
+				rdfs:label "Initial release."
+			]
+		]
 	] ;
+	doap:maintainer <http://drobilla.net/drobilla#me> ,
+		_:larsl ;
 	lv2:documentation """
 <p><span class="warning">This extension is deprecated.</span> New
 implementations should use <a href="http://lv2plug.in/ns/ext/urid">LV2 URID</a>
diff --git a/lv2/ns/ext/urid/urid.ttl b/lv2/ns/ext/urid/urid.ttl
index 6fc01e6..aa46f2f 100644
--- a/lv2/ns/ext/urid/urid.ttl
+++ b/lv2/ns/ext/urid/urid.ttl
@@ -14,12 +14,25 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+@prefix dcs:  <http://ontologi.es/doap-changeset#> .
 @prefix doap: <http://usefulinc.com/ns/doap#> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix lv2:  <http://lv2plug.in/ns/lv2core#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix urid: <http://lv2plug.in/ns/ext/urid#> .
 
+<http://drobilla.net/drobilla#me>
+	a foaf:Person ;
+	foaf:name "David Robillard" ;
+	foaf:homepage <http://drobilla.net/> ;
+	foaf:mbox <mailto:d@drobilla.net> ;
+	rdfs:seeAlso <http://drobilla.net/drobilla> .
+
+_:gabrbedd
+	a foaf:Person ;
+	foaf:name "Gabriel M. Beddingfield" ;
+	foaf:homepage <http://gabe.is-a-geek.org/> .
+
 <http://lv2plug.in/ns/ext/urid>
 	a lv2:Specification ;
 	doap:license <http://opensource.org/licenses/isc-license> ;
@@ -27,13 +40,15 @@
 	doap:shortdesc "Features for mapping URIs to and from integers." ;
 	doap:release [
 		doap:revision "1.0" ;
-		doap:created "2011-11-20"
-	] ;
-	doap:developer [
-		a foaf:Person ;
-		foaf:name "Gabriel M. Beddingfield" ;
-		foaf:homepage <http://gabe.is-a-geek.org/>
+		doap:created "2011-11-20" ;
+		dcs:blame <http://drobilla.net/drobilla#me> ;
+		dcs:changeset [
+			dcs:item [
+				rdfs:label "Initial release."
+			]
+		]
 	] ;
+	doap:developer _:gabrbedd ;
 	lv2:documentation """
 <p>This extension defines a simple mechanism for plugins to map URIs to and
 from integers, usually for performance reasons (e.g. processing events typed by
diff --git a/lv2/ns/lv2core/lv2core.doap.ttl b/lv2/ns/lv2core/lv2core.doap.ttl
index bf4e372..1c12fff 100644
--- a/lv2/ns/lv2core/lv2core.doap.ttl
+++ b/lv2/ns/lv2core/lv2core.doap.ttl
@@ -99,7 +99,7 @@
 		dcs:blame <http://drobilla.net/drobilla#me> ;
 		dcs:changeset [
 			dcs:item [
-				rdfs:label "Initial packaging."
+				rdfs:label "Initial release."
 			]
 		]
 	] ;
diff --git a/wscript b/wscript
index 5403b8a..7dd8786 100644
--- a/wscript
+++ b/wscript
@@ -57,12 +57,19 @@ def release(ctx):
     rdf  = rdflib.Namespace('http://www.w3.org/1999/02/22-rdf-syntax-ns#')
     doap = rdflib.Namespace('http://usefulinc.com/ns/doap#')
 
-    manifests = glob.glob('ext/*.lv2/manifest.ttl')
-    manifests += glob.glob('extensions/*.lv2/manifest.ttl')
+    try:
+        shutil.rmtree('build/spec')
+    except:
+        pass
+
+    os.makedirs('build/spec')
+
+    manifests = glob.glob('lv2/ns/lv2core/manifest.ttl')
+    manifests += glob.glob('lv2/ns/*/*/manifest.ttl')
     for manifest in manifests:
         dir = os.path.dirname(manifest)
         name = os.path.basename(dir).replace('.lv2', '')
-        
+
         m = rdflib.ConjunctiveGraph()
         m.parse(manifest, format='n3')
 
@@ -78,12 +85,17 @@ def release(ctx):
             continue
 
         if minor != 0 and micro % 2 == 0:
+            autowaf.display_header('\nBuilding %s Release\n' % dir)
             try:
                 subprocess.call(
-                    ['./waf', 'distclean', 'configure', 'build', 'distcheck', 'distclean'],
+                    ['./waf', 'distclean', 'configure', 'build', 'distcheck'],
                     cwd=dir)
+                for i in glob.glob(dir + '/*.tar.bz2'):
+                    shutil.move(i, 'build/spec')
             except:
-                Logs.error('Error building %s release' % name)
+                Logs.error('Error building %s release' % (name, e))
+
+            subprocess.call(['./waf', 'distclean'], cwd=dir)
         
 def lint(ctx):
     for i in (['lv2/ns/lv2core/lv2.h']