aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-07-31 07:53:03 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2017-07-31 18:47:09 -0400
commita572ebd2a19ff9501e3c03b0cec71f5a5aef5ceb (patch)
tree1a391342821a8e1e896731a5f8ff2f7dc43be39c /mesonbuild/interpreter.py
parent1826872fd25cf72ec65378891125a264e625da88 (diff)
downloadmeson-a572ebd2a19ff9501e3c03b0cec71f5a5aef5ceb.zip
meson-a572ebd2a19ff9501e3c03b0cec71f5a5aef5ceb.tar.gz
meson-a572ebd2a19ff9501e3c03b0cec71f5a5aef5ceb.tar.bz2
Convert man inputs to Files so you can install_man the output of configure_file. Closes #2135.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 1858e8c..94fb649 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -465,13 +465,10 @@ class InstallDir(InterpreterObject):
class Man(InterpreterObject):
- def __init__(self, source_subdir, sources, kwargs):
+ def __init__(self, sources, kwargs):
InterpreterObject.__init__(self)
- self.source_subdir = source_subdir
self.sources = sources
self.validate_sources()
- if len(kwargs) > 1:
- raise InvalidArguments('Man function takes at most one keyword arguments.')
self.custom_install_dir = kwargs.get('install_dir', None)
if self.custom_install_dir is not None and not isinstance(self.custom_install_dir, str):
raise InterpreterException('Custom_install_dir must be a string.')
@@ -491,9 +488,6 @@ class Man(InterpreterObject):
def get_sources(self):
return self.sources
- def get_source_subdir(self):
- return self.source_subdir
-
class GeneratedObjectsHolder(InterpreterObject):
def __init__(self, held_object):
super().__init__()
@@ -2354,9 +2348,9 @@ class Interpreter(InterpreterBase):
return h
@permittedKwargs(permitted_kwargs['install_man'])
- @stringArgs
def func_install_man(self, node, args, kwargs):
- m = Man(self.subdir, args, kwargs)
+ fargs = self.source_strings_to_files(args)
+ m = Man(fargs, kwargs)
self.build.man.append(m)
return m