aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-02-24 01:31:01 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-02-24 01:31:01 +0200
commit78fd215dc838216a3ec836d28a84114253ea5e93 (patch)
tree1d3bebbbe649a32a53af46c6a7742a485a59a0e0
parent7371ad676edd6711fd5dcff7b8de037c46763626 (diff)
downloadmeson-78fd215dc838216a3ec836d28a84114253ea5e93.zip
meson-78fd215dc838216a3ec836d28a84114253ea5e93.tar.gz
meson-78fd215dc838216a3ec836d28a84114253ea5e93.tar.bz2
Variable name simplification.
-rwxr-xr-xbackends.py2
-rw-r--r--test cases/30 pipeline/meson.build4
2 files changed, 3 insertions, 3 deletions
diff --git a/backends.py b/backends.py
index fcc2dff..ff80a59 100755
--- a/backends.py
+++ b/backends.py
@@ -361,7 +361,7 @@ class NinjaBackend(Backend):
for i in range(len(infilelist)):
infilename = os.path.join(self.build_to_src, infilelist[i])
outfilename = os.path.join(self.get_target_dir(target), outfilelist[i])
- args = [x.replace("@INPUTNAME@", infilename).replace('@OUTPUTNAME@', outfilename)\
+ args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', outfilename)\
for x in base_args]
cmdlist = [exe_file] + args
build = 'build %s: CUSTOM_COMMAND %s | %s\n' % \
diff --git a/test cases/30 pipeline/meson.build b/test cases/30 pipeline/meson.build
index f43d18c..e93890f 100644
--- a/test cases/30 pipeline/meson.build
+++ b/test cases/30 pipeline/meson.build
@@ -3,8 +3,8 @@ project('pipeline test', 'c')
e1 = executable('srcgen', 'srcgen.c')
gen = generator(e1, \
-name_rule : '@BASENAME@.c', \
-arguments : ['@INPUTNAME@', '@OUTPUTNAME@'])
+ name_rule : '@BASENAME@.c', \
+ arguments : ['@INPUT@', '@OUTPUT@'])
generated = gen.process('input_src.dat')