diff options
| author | Ferdinand Thiessen <rpm@fthiessen.de> | 2022-04-23 13:28:07 +0200 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-04-27 09:29:38 -0400 |
| commit | 6f156e8dddcf2fba2fd0193e192544c03bf6b2dc (patch) | |
| tree | 4dfbfe7f9b87e1d41397b9363a11519964d8dfe0 | |
| parent | e4d9ba5c9ecca494c028a81730b2c9a753801612 (diff) | |
| download | meson-6f156e8dddcf2fba2fd0193e192544c03bf6b2dc.zip meson-6f156e8dddcf2fba2fd0193e192544c03bf6b2dc.tar.gz meson-6f156e8dddcf2fba2fd0193e192544c03bf6b2dc.tar.bz2 | |
gnome: Use 'doc' install_tag for gnome.yelp
| -rw-r--r-- | docs/markdown/Installing.md | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/docs/markdown/Installing.md b/docs/markdown/Installing.md index 0f7cbb5..d29e09d 100644 --- a/docs/markdown/Installing.md +++ b/docs/markdown/Installing.md @@ -168,6 +168,7 @@ time, please help extending the list of well known categories. * `install_man()`. - `doc`: * `gnome.gtkdoc()`, + * `gnome.yelp()`, * `hotdoc.generate_doc()`. - `i18n`: * `i18n.gettext()`, diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 8c63647..ed07aa8 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1281,7 +1281,7 @@ class GnomeModule(ExtensionModule): install_dir = os.path.join(state.environment.get_datadir(), 'help') c_install_dir = os.path.join(install_dir, 'C', project_id) c_data = build.Data(sources_files, c_install_dir, c_install_dir, - mesonlib.FileMode(), state.subproject) + mesonlib.FileMode(), state.subproject, install_tag='doc') targets.append(c_data) media_files: T.List[mesonlib.File] = [] @@ -1291,7 +1291,7 @@ class GnomeModule(ExtensionModule): media_files.append(f) m_install_dir = os.path.join(c_install_dir, os.path.dirname(m)) m_data = build.Data([f], m_install_dir, m_install_dir, - mesonlib.FileMode(), state.subproject) + mesonlib.FileMode(), state.subproject, install_tag='doc') targets.append(m_data) pot_file = os.path.join('@SOURCE_ROOT@', state.subdir, 'C', project_id + '.pot') @@ -1314,14 +1314,14 @@ class GnomeModule(ExtensionModule): if symlinks: link_target = os.path.join(os.path.relpath(c_install_dir, start=m_install_dir), m) l_data = build.SymlinkData(link_target, os.path.basename(m), - m_install_dir, state.subproject) + m_install_dir, state.subproject, install_tag='doc') else: try: m_file = mesonlib.File.from_source_file(state.environment.source_dir, l_subdir, m) except MesonException: m_file = media_files[i] l_data = build.Data([m_file], m_install_dir, m_install_dir, - mesonlib.FileMode(), state.subproject) + mesonlib.FileMode(), state.subproject, install_tag='doc') targets.append(l_data) po_file = l + '.po' @@ -1344,6 +1344,7 @@ class GnomeModule(ExtensionModule): [msgfmt, '@INPUT@', '-o', '@OUTPUT@'], [po_file], [gmo_file], + install_tag=['doc'], ) targets.append(gmotarget) @@ -1358,6 +1359,7 @@ class GnomeModule(ExtensionModule): extra_depends=[gmotarget], install=True, install_dir=[l_install_dir], + install_tag=['doc'], ) targets.append(mergetarget) |