Skip to content

install_man: add support install_tag kwarg #15413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cepelinas9000 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

install_man: add support install_tag kwarg #15413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion mesonbuild/backend/backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1854,7 +1854,10 @@ def generate_man_install(self, d: InstallData) -> None:
srcabs = f.absolute_path(self.environment.get_source_dir(), self.environment.get_build_dir())
dstname = os.path.join(subdir, os.path.basename(fname))
dstabs = dstname.replace('{mandir}', manroot)
i = InstallDataBase(srcabs, dstabs, dstname, m.get_custom_install_mode(), m.subproject, tag='man')
tag = 'man'
if m.install_tag is not None:
tag = m.install_tag
i = InstallDataBase(srcabs, dstabs, dstname, m.get_custom_install_mode(), m.subproject, tag=tag)
d.man.append(i)

def generate_emptydir_install(self, d: InstallData) -> None:
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ class Man(HoldableObject):
custom_install_mode: 'FileMode'
subproject: str
locale: T.Optional[str]
install_tag: T.Optional[str] = None

def get_custom_install_dir(self) -> T.Optional[str]:
return self.custom_install_dir
Expand Down
3 changes: 2 additions & 1 deletion mesonbuild/interpreter/interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2341,6 +2341,7 @@ def func_install_headers(self, node: mparser.BaseNode,
KwargInfo('locale', (str, NoneType), since='0.58.0'),
INSTALL_MODE_KW.evolve(since='0.47.0'),
INSTALL_DIR_KW,
INSTALL_TAG_KW.evolve(since='1.11.0')
)
def func_install_man(self, node: mparser.BaseNode,
args: T.Tuple[T.List['mesonlib.FileOrString']],
Expand All @@ -2358,7 +2359,7 @@ def func_install_man(self, node: mparser.BaseNode,
raise InvalidArguments('Man file must have a file extension of a number between 1 and 9')

m = build.Man(sources, kwargs['install_dir'], install_mode,
self.subproject, kwargs['locale'])
self.subproject, kwargs['locale'], kwargs['install_tag'])
self.build.man.append(m)

return m
Expand Down
Loading