aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-02-24 01:54:01 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-02-24 01:54:01 +0200
commit8d6a681b237828c2f925f4f181da4995843b2f70 (patch)
tree125666d5c96ead9e7f4a4211689934b797b66f1e
parent0f60793b1576a5ed55dc444f9ae4efb8782ca5af (diff)
downloadmeson-8d6a681b237828c2f925f4f181da4995843b2f70.zip
meson-8d6a681b237828c2f925f4f181da4995843b2f70.tar.gz
meson-8d6a681b237828c2f925f4f181da4995843b2f70.tar.bz2
Renamed a keyword argument.
-rwxr-xr-xinterpreter.py12
-rw-r--r--test cases/30 pipeline/meson.build2
2 files changed, 7 insertions, 7 deletions
diff --git a/interpreter.py b/interpreter.py
index ecdf718..35c9a62 100755
--- a/interpreter.py
+++ b/interpreter.py
@@ -66,15 +66,15 @@ class Generator(InterpreterObject):
raise InvalidArguments('A non-string object in "arguments" keyword argument.')
self.arglist = args
- if 'name_rule' not in kwargs:
- raise InvalidArguments('Generator must have "name_rule" keyword argument.')
- rule = kwargs['name_rule']
+ if 'output_name' not in kwargs:
+ raise InvalidArguments('Generator must have "output_name" keyword argument.')
+ rule = kwargs['output_name']
if not isinstance(rule, str):
- raise InvalidArguments('"name_rule" keyword argument must be a string.')
+ raise InvalidArguments('"output_name" keyword argument must be a string.')
if not '@BASENAME@' in rule:
- raise InvalidArguments('"name_rule" must contain @BASENAME@.')
+ raise InvalidArguments('"output_name" must contain @BASENAME@.')
if '/' in rule:
- raise InvalidArguments('"name_rule" must not contain a slash.')
+ raise InvalidArguments('"output_name" must not contain a slash.')
self.name_rule = rule
def get_base_outname(self, inname):
diff --git a/test cases/30 pipeline/meson.build b/test cases/30 pipeline/meson.build
index e93890f..4192c49 100644
--- a/test cases/30 pipeline/meson.build
+++ b/test cases/30 pipeline/meson.build
@@ -3,7 +3,7 @@ project('pipeline test', 'c')
e1 = executable('srcgen', 'srcgen.c')
gen = generator(e1, \
- name_rule : '@BASENAME@.c', \
+ output_name : '@BASENAME@.c', \
arguments : ['@INPUT@', '@OUTPUT@'])
generated = gen.process('input_src.dat')