aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-10-02 06:13:44 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-10-04 21:20:57 +0300
commitc0c075c1298ad9018a62d75a632af1c0d0d7d0f8 (patch)
treecadf15c9de967df71bf047233790d722faf46ff1 /mesonbuild/interpreter.py
parent577d6bfdb483452b2a9434ba3a1d7031094b0cbd (diff)
downloadmeson-c0c075c1298ad9018a62d75a632af1c0d0d7d0f8.zip
meson-c0c075c1298ad9018a62d75a632af1c0d0d7d0f8.tar.gz
meson-c0c075c1298ad9018a62d75a632af1c0d0d7d0f8.tar.bz2
Make custom dist scripts accept arguments.
meson.add_dist_script, introduced in #3906, did not accept any arguments other than script name. Since all other meson.add_*_script methods do accept args, this makes the dist script accept them as well.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 131c24e..a4d9472 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1686,12 +1686,15 @@ class MesonMain(InterpreterObject):
@permittedKwargs({})
def add_dist_script_method(self, args, kwargs):
- if len(args) != 1:
- raise InterpreterException('add_dist_script takes exactly one argument')
+ if len(args) < 1:
+ raise InterpreterException('add_dist_script takes one or more arguments')
+ if len(args) > 1:
+ FeatureNew('Calling "add_dist_script" with multiple arguments', '0.49.0').use(self.interpreter.subproject)
check_stringlist(args, 'add_dist_script argument must be a string')
if self.interpreter.subproject != '':
raise InterpreterException('add_dist_script may not be used in a subproject.')
- self.build.dist_scripts.append(os.path.join(self.interpreter.subdir, args[0]))
+ script = self._find_source_script(args[0], args[1:])
+ self.build.dist_scripts.append(script)
@noPosargs
@permittedKwargs({})