aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-11-26 20:33:47 +0000
committerDavid Robillard <d@drobilla.net>2010-11-26 20:33:47 +0000
commit8db955c711c0928e241e5dc7b77bf335dd4bb6d6 (patch)
treedf1a53b0c1d618b930fc59a20367703ea88c6316
parente0c4fb1bc1c66e5655a41ddcbfaafb07e32b93a2 (diff)
downloadlv2-8db955c711c0928e241e5dc7b77bf335dd4bb6d6.tar.xz
Remove scheme from LV2 #include directives.
Check the given header directory is named 'lv2' (to conform to #include standard).
-rwxr-xr-xcore.lv2/lv2config7
-rw-r--r--ext/atom.lv2/atom-helpers.h2
-rw-r--r--ext/event.lv2/event-helpers.h2
-rw-r--r--ext/message.lv2/message.h2
-rw-r--r--ext/osc.lv2/osc-print.h2
5 files changed, 9 insertions, 6 deletions
diff --git a/core.lv2/lv2config b/core.lv2/lv2config
index 5f43716..10d77e3 100755
--- a/core.lv2/lv2config
+++ b/core.lv2/lv2config
@@ -104,6 +104,10 @@ def build_tree(search_path, outdir):
"""Build a directory tree under outdir containing symlinks to all LV2
extensions found in search_path, such that the symlink paths correspond to
the extension URIs."""
+ if os.path.basename(outdir) != 'lv2':
+ print >> sys.stderr, "lv2config: output dir must be named `lv2'"
+ sys.exit(1)
+
if os.access(outdir, os.F_OK) and not os.access(outdir, os.W_OK):
print >> sys.stderr, "lv2config: cannot build `%s': Permission denied" % outdir
sys.exit(1)
@@ -120,9 +124,8 @@ def build_tree(search_path, outdir):
# Query extension URI
specs = rdf_find_type(manifest, lv2.Specification)
for ext_uri in specs:
- ext_scheme = ext_uri[0:ext_uri.find(':')]
ext_path = os.path.normpath(ext_uri[ext_uri.find(':') + 1:].lstrip('/'))
- ext_dir = os.path.join(outdir, ext_scheme, ext_path)
+ ext_dir = os.path.join(outdir, ext_path)
# Make parent directories
__mkdir_p(os.path.dirname(ext_dir))
diff --git a/ext/atom.lv2/atom-helpers.h b/ext/atom.lv2/atom-helpers.h
index 787d0c7..d48580f 100644
--- a/ext/atom.lv2/atom-helpers.h
+++ b/ext/atom.lv2/atom-helpers.h
@@ -22,7 +22,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
/** @file
* Helper functions for the LV2 Atom extension
diff --git a/ext/event.lv2/event-helpers.h b/ext/event.lv2/event-helpers.h
index ae9fb60..d97ae73 100644
--- a/ext/event.lv2/event-helpers.h
+++ b/ext/event.lv2/event-helpers.h
@@ -25,7 +25,7 @@
#include <string.h>
#include <stdlib.h>
#include <assert.h>
-#include "lv2/http/lv2plug.in/ns/ext/event/event.h"
+#include "lv2/lv2plug.in/ns/ext/event/event.h"
/** @file
* Helper functions for the LV2 Event extension
diff --git a/ext/message.lv2/message.h b/ext/message.lv2/message.h
index 45391c3..0d1effa 100644
--- a/ext/message.lv2/message.h
+++ b/ext/message.lv2/message.h
@@ -28,7 +28,7 @@
#include <stdint.h>
#include <stddef.h>
-#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
/** An LV2 Message.
*
diff --git a/ext/osc.lv2/osc-print.h b/ext/osc.lv2/osc-print.h
index 8e34882..ceebbf7 100644
--- a/ext/osc.lv2/osc-print.h
+++ b/ext/osc.lv2/osc-print.h
@@ -23,7 +23,7 @@
#ifndef LV2_OSC_PRINT_H
#define LV2_OSC_PRINT_H
-#include "lv2/http/lv2plug.in/ns/ext/osc/osc.h"
+#include "lv2/lv2plug.in/ns/ext/osc/osc.h"
#ifdef __cplusplus
extern "C" {