diff --git a/plugins/chordz/ttl_gen.c b/plugins/chordz/ttl_gen.c index b77799b..071ac03 100644 --- a/plugins/chordz/ttl_gen.c +++ b/plugins/chordz/ttl_gen.c @@ -45,7 +45,6 @@ int main ( fprintf (f, "@prefix atom: .\n\ @prefix doap: .\n\ -@prefix foaf: .\n\ @prefix log: .\n\ @prefix lv2: .\n\ @prefix midi: .\n\ @@ -58,21 +57,11 @@ int main ( @prefix ui: .\n\ @prefix work: .\n\n"); - fprintf (f, -"<" PROJECT_URI ">\n\ - a doap:Project ;\n\ - doap:name \"Zrythm plugins\" .\n\ -\n"); - fprintf (f, "<" PLUGIN_URI ">\n\ a lv2:Plugin,\n\ lv2:MIDIPlugin ;\n\ doap:name \"" PLUGIN_NAME "\" ;\n\ - doap:maintainer [\n\ - foaf:name \"\"\"Alexandros Theodotou\"\"\" ;\n\ - foaf:homepage ;\n\ - ] ;\n\ doap:license ;\n\ lv2:project <" PROJECT_URI "> ;\n\ lv2:requiredFeature urid:map ;\n\ diff --git a/plugins/chordz/manifest.ttl.in b/plugins/manifest.ttl.in similarity index 72% rename from plugins/chordz/manifest.ttl.in rename to plugins/manifest.ttl.in index 8620d57..6804a8e 100644 --- a/plugins/chordz/manifest.ttl.in +++ b/plugins/manifest.ttl.in @@ -15,14 +15,28 @@ # You should have received a copy of the GNU Affero General Public License # along with @PLUGIN_NAME@. If not, see . +@prefix doap: . +@prefix foaf: . @prefix lv2: . -@prefix rdfs: . @prefix pset: . +@prefix rdfs: . @prefix ui: . +<@PROJECT_URI@> + a doap:Project ; + doap:name "Zrythm plugins" ; + doap:maintainer [ + foaf:name """Alexandros Theodotou""" ; + foaf:homepage ; + ] ; + doap:repository [ + doap:browse ; + doap:location ; + ] . + <@PLUGIN_URI@> a lv2:Plugin, - lv2:MIDIPlugin ; + lv2:@PLUGIN_TYPE@ ; lv2:binary <@PLUGIN_DSP_BINARY@> ; lv2:minorVersion @PLUGIN_MINOR_VERSION@ ; lv2:microVersion @PLUGIN_MICRO_VERSION@ ; diff --git a/plugins/meson.build b/plugins/meson.build index d085930..67b9e7a 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -17,8 +17,8 @@ # name, version plugins = [ - ['Saw', '0.0.1'], - ['Chordz', '0.2.0'], + ['Saw', 'InstrumentPlugin', '0.0.1'], + ['Chordz', 'MIDIPlugin', '0.2.0'], ] foreach pl : plugins @@ -26,7 +26,8 @@ foreach pl : plugins pl_caps = pl[0].to_upper () pl_lowercase = pl[0].to_lower () pl_dsp_lib_name_noext = pl_str + '_dsp' - pl_version = pl[1] + pl_type = pl[1] + pl_version = pl[2] pl_minor_version = pl_version.split('.')[1] pl_micro_version = pl_version.split('.')[1] @@ -43,6 +44,8 @@ foreach pl : plugins 'PLUGIN_MINOR_VERSION', pl_minor_version) pl_cdata.set ( 'PLUGIN_MICRO_VERSION', pl_micro_version) + pl_cdata.set ( + 'PLUGIN_TYPE', pl_type) if os_windows pl_cdata.set ( 'PLUGIN_DSP_BINARY', pl_dsp_lib_name_noext + '.dll') @@ -117,7 +120,7 @@ foreach pl : plugins # create and install manifest ttl manifest_ttl = configure_file ( - input: join_paths (pl_lowercase, 'manifest.ttl.in'), + input: 'manifest.ttl.in', output: pl_str + '_manifest.ttl', configuration: pl_cdata, ) diff --git a/plugins/saw/manifest.ttl.in b/plugins/saw/manifest.ttl.in deleted file mode 100644 index c4e12a5..0000000 --- a/plugins/saw/manifest.ttl.in +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2020 Alexandros Theodotou -# -# This file is part of @PLUGIN_NAME@ -# -# @PLUGIN_NAME@ is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# @PLUGIN_NAME@ is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with @PLUGIN_NAME@. If not, see . - -@prefix lv2: . -@prefix rdfs: . -@prefix pset: . -@prefix ui: . - -<@PLUGIN_URI@> - a lv2:Plugin, - lv2:InstrumentPlugin ; - lv2:binary <@PLUGIN_DSP_BINARY@> ; - lv2:minorVersion @PLUGIN_MINOR_VERSION@ ; - lv2:microVersion @PLUGIN_MICRO_VERSION@ ; - rdfs:seeAlso <@PLUGIN_TTL@> . diff --git a/plugins/saw/ttl_gen.c b/plugins/saw/ttl_gen.c index faae8e5..c64b756 100644 --- a/plugins/saw/ttl_gen.c +++ b/plugins/saw/ttl_gen.c @@ -57,21 +57,11 @@ int main ( @prefix ui: .\n\ @prefix work: .\n\n"); - fprintf (f, -"<" PROJECT_URI ">\n\ - a doap:Project ;\n\ - doap:name \"Zrythm plugins\" .\n\ -\n"); - fprintf (f, "<" PLUGIN_URI ">\n\ a lv2:Plugin,\n\ lv2:InstrumentPlugin ;\n\ doap:name \"" PLUGIN_NAME "\" ;\n\ - doap:maintainer [\n\ - foaf:name \"\"\"Alexandros Theodotou\"\"\" ;\n\ - foaf:homepage ;\n\ - ] ;\n\ doap:license ;\n\ lv2:project <" PROJECT_URI "> ;\n\ lv2:requiredFeature urid:map ,\n\