diff options
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | meson.build | 21 | ||||
| -rw-r--r-- | sherlock.ttl | 4 |
4 files changed, 24 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f7f261..af394e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,10 +18,13 @@ stages: .build_template: &build_definition <<: *common_definition + before_script: + - export PATH="/opt/lv2/bin:$PATH" script: - meson --prefix="/opt/${CI_BUILD_NAME}" --libdir="lib" --cross-file "${CI_BUILD_NAME}" build - ninja -C build - ninja -C build install + - ninja -C build test - mkdir -p "${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/${BASE_NAME}" - cp -r "/opt/${CI_BUILD_NAME}/lib/lv2/${BASE_NAME}/" "${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/" @@ -1 +1 @@ -0.17.169 +0.17.171 diff --git a/meson.build b/meson.build index bf2bf83..e2ded89 100644 --- a/meson.build +++ b/meson.build @@ -42,6 +42,8 @@ lgen = generator(flex, arguments : ['--prefix=enc', '-o', '@OUTPUT@', '@INPUT@']) cp = find_program('cp') +lv2_validate = find_program('lv2_validate', native : true, required : false) +lv2lint = find_program('lv2lint', required : false) clone = [cp, '@INPUT@', '@OUTPUT@'] lfiles = lgen.process('encoder.l') @@ -101,19 +103,19 @@ ui = shared_module('sherlock_nk', ui_srcs, suffix = mod.full_path().strip().split('.')[-1] conf_data.set('MODULE_SUFFIX', '.' + suffix) -configure_file(input : 'manifest.ttl.in', output : 'manifest.ttl', +manifest_ttl = configure_file(input : 'manifest.ttl.in', output : 'manifest.ttl', configuration : conf_data, install : true, install_dir : inst_dir) -custom_target('dsp_ttl', +dsp_ttl = custom_target('dsp_ttl', input : 'sherlock.ttl', output : 'sherlock.ttl', command : clone, install : true, install_dir : inst_dir) -custom_target('ui_ttl', +ui_ttl = custom_target('ui_ttl', input : 'sherlock_ui.ttl', output : 'sherlock_ui.ttl', command : clone, @@ -126,3 +128,16 @@ custom_target('font', command : clone, install : true, install_dir : inst_dir) + +if lv2_validate.found() + test('LV2 validate', lv2_validate, + args : [manifest_ttl, dsp_ttl, ui_ttl]) +endif + +if lv2lint.found() + test('LV2 lint', lv2lint, + args : ['-Ewarn', + 'http://open-music-kontrollers.ch/lv2/sherlock#atom_inspector', + 'http://open-music-kontrollers.ch/lv2/sherlock#midi_inspector', + 'http://open-music-kontrollers.ch/lv2/sherlock#osc_inspector']) +endif diff --git a/sherlock.ttl b/sherlock.ttl index 87b1272..09935fc 100644 --- a/sherlock.ttl +++ b/sherlock.ttl @@ -90,7 +90,7 @@ sherlock:filter a lv2:Parameter ; rdfs:label "Filter" ; rdfs:comment "Filter events according to type or object type" ; - rdfs:range atom:URID . + rdfs:range atom:URI . sherlock:negate a lv2:Parameter ; @@ -155,7 +155,7 @@ sherlock:atom_inspector sherlock:follow , sherlock:pretty , sherlock:trace , - sherlock:filter, + sherlock:filter , sherlock:negate ; state:state [ |