diff options
| author | Bilal Elmoussaoui <bil.elmoussaoui@gmail.com> | 2019-02-10 15:54:46 +0300 |
|---|---|---|
| committer | Bilal Elmoussaoui <bil.elmoussaoui@gmail.com> | 2019-02-10 15:54:46 +0300 |
| commit | f73ac9a147540ba7f8ee3fa6015449ba5f3bdd29 (patch) | |
| tree | 9d02406c6c9829993d5b5bccf94de0024b744b48 /data | |
| parent | 7aa4f985b7be8724c2c0ddf1d098c873f833c7a1 (diff) | |
meson: improve desktop and appdata files validation
Diffstat (limited to 'data')
| -rw-r--r-- | data/meson.build | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/data/meson.build b/data/meson.build index e0ab6ea4..468c9212 100644 --- a/data/meson.build +++ b/data/meson.build @@ -3,7 +3,7 @@ UI_RESOURCES = gnome.compile_resources( 'org.gnome.FeedReader.gresource.xml', ) -i18n.merge_file( +desktop_file = i18n.merge_file( input: 'org.gnome.FeedReader.desktop.in', output: 'org.gnome.FeedReader.desktop', po_dir: PO_DIR, @@ -12,7 +12,7 @@ i18n.merge_file( install_dir: join_paths(SHARE_DIR, 'applications') ) -i18n.merge_file( +desktop_autostart_file = i18n.merge_file( input: 'org.gnome.FeedReader-autostart.desktop.in', output: 'org.gnome.FeedReader-autostart.desktop', po_dir: PO_DIR, @@ -21,7 +21,7 @@ i18n.merge_file( install_dir: DATA_DIR ) -i18n.merge_file( +appdata_file = i18n.merge_file( input: 'org.gnome.FeedReader.appdata.xml.in', output: 'org.gnome.FeedReader.appdata.xml', po_dir: PO_DIR, @@ -33,11 +33,13 @@ i18n.merge_file( desktop_file_validate = find_program('desktop-file-validate', required:false) if desktop_file_validate.found() - test ( - 'Validate desktop file', - desktop_file_validate, - args: join_paths(meson.current_build_dir (), 'org.gnome.FeedReader-autostart.desktop') - ) + foreach file: [desktop_file, desktop_autostart_file] + test ( + 'Validate desktop file', + desktop_file_validate, + args: file.full_path() + ) + endforeach endif appstreamcli = find_program('appstream-util', required:false) @@ -46,11 +48,11 @@ if appstreamcli.found() test ( 'Validate appdata file', appstreamcli, - args: ['validate-relax', join_paths(meson.current_build_dir (), 'org.gnome.FeedReader.appdata.xml')] + args: ['validate-relax', '--nonet', appdata_file.full_path()] ) endif subdir('application-icons') -install_subdir('GrabberConfig', install_dir : DATA_DIR) +install_subdir('GrabberConfig', install_dir: DATA_DIR) |