From 4fa774871b2057cb3ffbbb1e655b0f6e7db1881d Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 12 Mar 2018 14:20:41 +0100 Subject: [PATCH] help: use gnome.yelp helper in help meson file Fixes #2172 --- help/C/meson.build | 7 ------- help/LINGUAS | 9 +++++++++ help/ca/meson.build | 19 ------------------- help/cs/meson.build | 19 ------------------- help/de/meson.build | 19 ------------------- help/el/meson.build | 18 ------------------ help/es/meson.build | 18 ------------------ help/fr/meson.build | 18 ------------------ help/meson.build | 37 ++++++++++++++++++++++++++----------- help/sl/meson.build | 18 ------------------ help/sv/meson.build | 18 ------------------ help/uk/meson.build | 18 ------------------ 12 files changed, 35 insertions(+), 183 deletions(-) delete mode 100644 help/C/meson.build create mode 100644 help/LINGUAS delete mode 100644 help/ca/meson.build delete mode 100644 help/cs/meson.build delete mode 100644 help/de/meson.build delete mode 100644 help/el/meson.build delete mode 100644 help/es/meson.build delete mode 100644 help/fr/meson.build delete mode 100644 help/sl/meson.build delete mode 100644 help/sv/meson.build delete mode 100644 help/uk/meson.build diff --git a/help/C/meson.build b/help/C/meson.build deleted file mode 100644 index a1c073164..000000000 --- a/help/C/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -_help_installdir = get_option('datadir') + '/help/C/pitivi' -install_subdir('figures', install_dir: _help_installdir) - -foreach help_page: help_pages - install_data(help_page, install_dir: _help_installdir) -endforeach - diff --git a/help/LINGUAS b/help/LINGUAS new file mode 100644 index 000000000..90a3c2081 --- /dev/null +++ b/help/LINGUAS @@ -0,0 +1,9 @@ +ca +cs +de +el +es +fr +sl +sv +uk diff --git a/help/ca/meson.build b/help/ca/meson.build deleted file mode 100644 index ad72b84f0..000000000 --- a/help/ca/meson.build +++ /dev/null @@ -1,19 +0,0 @@ -lang = 'ca' - -_help_installdir = get_option('datadir') + '/help/' + lang + '/pitivi/' -install_subdir('figures', install_dir: _help_installdir) - -mo = custom_target(lang + '.mo', - output : lang + '.mo', - input : lang + '.po', - command : [msgfmt, '@INPUT@', '--output-file', '@OUTPUT@']) - -foreach help_page: help_pages - custom_target(lang + '.' + help_page + '.page', - output : help_page, - input : '../C/' + help_page, - command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'], - install: true, - install_dir: get_option('datadir') + '/help/' + lang + '/pitivi/') -endforeach - diff --git a/help/cs/meson.build b/help/cs/meson.build deleted file mode 100644 index 176fa970e..000000000 --- a/help/cs/meson.build +++ /dev/null @@ -1,19 +0,0 @@ -lang = 'cs' - -_help_installdir = get_option('datadir') + '/help/' + lang + '/pitivi/' -install_subdir('figures', install_dir: _help_installdir) - -mo = custom_target(lang + '.mo', - output : lang + '.mo', - input : lang + '.po', - command : [msgfmt, '@INPUT@', '--output-file', '@OUTPUT@']) - -foreach help_page: help_pages - custom_target(lang + '.' + help_page + '.page', - output : help_page, - input : '../C/' + help_page, - command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'], - install: true, - install_dir: get_option('datadir') + '/help/' + lang + '/pitivi/') -endforeach - diff --git a/help/de/meson.build b/help/de/meson.build deleted file mode 100644 index 0be9e1c6c..000000000 --- a/help/de/meson.build +++ /dev/null @@ -1,19 +0,0 @@ -lang = 'de' - -_help_installdir = get_option('datadir') + '/help/' + lang + '/pitivi/' -install_subdir('figures', install_dir: _help_installdir) - -mo = custom_target(lang + '.mo', - output : lang + '.mo', - input : lang + '.po', - command : [msgfmt, '@INPUT@', '--output-file', '@OUTPUT@']) - -foreach help_page: help_pages - custom_target(lang + '.' + help_page + '.page', - output : help_page, - input : '../C/' + help_page, - command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'], - install: true, - install_dir: get_option('datadir') + '/help/' + lang + '/pitivi/') -endforeach - diff --git a/help/el/meson.build b/help/el/meson.build deleted file mode 100644 index e1bca0e33..000000000 --- a/help/el/meson.build +++ /dev/null @@ -1,18 +0,0 @@ -lang = 'el' - -_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi') -install_subdir('figures', install_dir: _help_installdir) - -mo = custom_target(lang + '.mo', - output : lang + '.mo', - input : lang + '.po', - command : [msgfmt, '@INPUT@', '--output-file', '@OUTPUT@']) - -foreach help_page: help_pages - custom_target(lang + '.' + help_page + '.page', - output : help_page, - input : join_paths('../C', help_page), - command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'], - install: true, - install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi')) -endforeach diff --git a/help/es/meson.build b/help/es/meson.build deleted file mode 100644 index 9f5704b1b..000000000 --- a/help/es/meson.build +++ /dev/null @@ -1,18 +0,0 @@ -lang = 'es' - -_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi') -install_subdir('figures', install_dir: _help_installdir) - -mo = custom_target(lang + '.mo', - output : lang + '.mo', - input : lang + '.po', - command : [msgfmt, '@INPUT@', '--output-file', '@OUTPUT@']) - -foreach help_page: help_pages - custom_target(lang + '.' + help_page + '.page', - output : help_page, - input : join_paths('../C', help_page), - command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'], - install: true, - install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi')) -endforeach diff --git a/help/fr/meson.build b/help/fr/meson.build deleted file mode 100644 index 8bf5f2f25..000000000 --- a/help/fr/meson.build +++ /dev/null @@ -1,18 +0,0 @@ -lang = 'fr' - -_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi') -install_subdir('figures', install_dir: _help_installdir) - -mo = custom_target(lang + '.mo', - output : lang + '.mo', - input : lang + '.po', - command : [msgfmt, '@INPUT@', '--output-file', '@OUTPUT@']) - -foreach help_page: help_pages - custom_target(lang + '.' + help_page + '.page', - output : help_page, - input : join_paths('../C', help_page), - command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'], - install: true, - install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi')) -endforeach diff --git a/help/meson.build b/help/meson.build index 7b43d2f73..9c19fdbb5 100644 --- a/help/meson.build +++ b/help/meson.build @@ -1,4 +1,6 @@ -help_pages = [ +gnome = import('gnome') + +sources = [ 'about.page', 'cheatsheet.page', 'codecscontainers.page', @@ -27,13 +29,26 @@ help_pages = [ 'workwithprojects.page' ] -subdir('C') -subdir('ca') -subdir('cs') -subdir('de') -subdir('el') -subdir('es') -subdir('fr') -subdir('sl') -subdir('sv') -subdir('uk') +media = [ + 'figures/codecscontainers.jpg', + 'figures/fadestep1.png', + 'figures/fadestep2.png', + 'figures/fadestep3.png', + 'figures/keyframecurves.png', + 'figures/layers.png', + 'figures/logo.png', + 'figures/mainwindow.jpg', + 'figures/ripple-after.png', + 'figures/ripple-before.png', + 'figures/roll-after.png', + 'figures/roll-before.png', + 'figures/ruler.png', + 'figures/trimming-individual.png' +] + +gnome.yelp( + meson.project_name(), + sources: sources, + media: media, + symlink_media: true +) diff --git a/help/sl/meson.build b/help/sl/meson.build deleted file mode 100644 index 3931c9a43..000000000 --- a/help/sl/meson.build +++ /dev/null @@ -1,18 +0,0 @@ -lang = 'sl' - -_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi') -install_subdir('figures', install_dir: _help_installdir) - -mo = custom_target(lang + '.mo', - output : lang + '.mo', - input : lang + '.po', - command : [msgfmt, '@INPUT@', '--output-file', '@OUTPUT@']) - -foreach help_page: help_pages - custom_target(lang + '.' + help_page + '.page', - output : help_page, - input : join_paths('../C', help_page), - command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'], - install: true, - install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi')) -endforeach diff --git a/help/sv/meson.build b/help/sv/meson.build deleted file mode 100644 index f1cb574ef..000000000 --- a/help/sv/meson.build +++ /dev/null @@ -1,18 +0,0 @@ -lang = 'sv' - -_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi') -install_subdir('figures', install_dir: _help_installdir) - -mo = custom_target(lang + '.mo', - output : lang + '.mo', - input : lang + '.po', - command : [msgfmt, '@INPUT@', '--output-file', '@OUTPUT@']) - -foreach help_page: help_pages - custom_target(lang + '.' + help_page + '.page', - output : help_page, - input : join_paths('../C', help_page), - command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'], - install: true, - install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi')) -endforeach diff --git a/help/uk/meson.build b/help/uk/meson.build deleted file mode 100644 index 37c9a22fa..000000000 --- a/help/uk/meson.build +++ /dev/null @@ -1,18 +0,0 @@ -lang = 'uk' - -_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi') -install_subdir('figures', install_dir: _help_installdir) - -mo = custom_target(lang + '.mo', - output : lang + '.mo', - input : lang + '.po', - command : [msgfmt, '@INPUT@', '--output-file', '@OUTPUT@']) - -foreach help_page: help_pages - custom_target(lang + '.' + help_page + '.page', - output : help_page, - input : join_paths('../C', help_page), - command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'], - install: true, - install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi')) -endforeach -- GitLab