forked from pool/meson
Dominique Leuenberger
95fd1c47f0
Update to 0.62.1 OBS-URL: https://build.opensuse.org/request/show/972950 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=224
85 lines
3.8 KiB
Diff
85 lines
3.8 KiB
Diff
From 92741a72e1e8f6af2674a695c5f3752161626d74 Mon Sep 17 00:00:00 2001
|
|
From: Ferdinand Thiessen <rpm@fthiessen.de>
|
|
Date: Sat, 23 Apr 2022 13:28:07 +0200
|
|
Subject: gnome: Use 'doc' install_tag for gnome.yelp
|
|
|
|
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
|
index 8c6364740..ed07aa849 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)
|
|
|
|
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
|
|
index 22927f9f2..c223dc88d 100644
|
|
--- a/mesonbuild/build.py
|
|
+++ b/mesonbuild/build.py
|
|
@@ -2450,13 +2450,9 @@ class CustomTarget(Target, CommandBase):
|
|
self.install = install
|
|
self.install_dir = list(install_dir or [])
|
|
self.install_mode = install_mode
|
|
- _install_tag: T.List[T.Optional[str]]
|
|
- if not install_tag:
|
|
- _install_tag = [None] * len(self.outputs)
|
|
- elif len(install_tag) == 1:
|
|
- _install_tag = list(install_tag) * len(self.outputs)
|
|
- else:
|
|
- _install_tag = list(install_tag)
|
|
+ _install_tag = [None] if not install_tag else stringlistify(install_tag)
|
|
+ if len(_install_tag) == 1:
|
|
+ _install_tag = list(_install_tag) * len(self.outputs)
|
|
self.install_tag = _install_tag
|
|
self.name = name if name else self.outputs[0]
|
|
|
|
--
|
|
2.36.0
|
|
|