From 8fb5476a1cc58fec48bede4e407f03e19ce00bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 11 Apr 2020 00:42:14 +0200 Subject: [PATCH] build: Drop syntax-checks from `meson test` Those checks are just as well handled by the CI, and removing them makes for a nice build system cleanup. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/116 --- extensions/meson.build | 24 ++++-------------------- meson.build | 2 -- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/extensions/meson.build b/extensions/meson.build index ed7a2edc..ca00d01a 100644 --- a/extensions/meson.build +++ b/extensions/meson.build @@ -3,7 +3,7 @@ js_sources = [] metadata_name = 'metadata.json' -foreach e : all_extensions +foreach e : enabled_extensions uuid = e + uuid_suffix metadata_conf = configuration_data() @@ -19,27 +19,11 @@ foreach e : all_extensions subdir(e) - js_sources += extension_sources - - if (enabled_extensions.contains(e)) - install_data (extension_sources + extension_data, - install_dir: join_paths(extensiondir, uuid) - ) - endif + install_data (extension_sources + extension_data, + install_dir: join_paths(extensiondir, uuid) + ) endforeach install_data (extension_schemas, install_dir: schemadir ) - -foreach js_source : js_sources - if (js68.found()) - path_array = '@0@'.format(js_source).split('/') - name = join_paths(path_array[-2], path_array[-1]) - - test('Checking syntax of ' + name, js68, - args: ['-s', '-c', js_source], - workdir: meson.current_source_dir() - ) - endif -endforeach diff --git a/meson.build b/meson.build index ffb709a2..77633edc 100644 --- a/meson.build +++ b/meson.build @@ -20,8 +20,6 @@ schemadir = join_paths(datadir, 'glib-2.0', 'schemas') sessiondir = join_paths(datadir, 'gnome-session', 'sessions') xsessiondir = join_paths(datadir, 'xsessions') -js68 = find_program('js68', required: false) - ver_arr = meson.project_version().split('.') if ver_arr[1].to_int().is_even() shell_version = '@0@.@1@'.format(ver_arr[0], ver_arr[1])