Can use generator outputs in custom targets. Closes #587.

3 files changed, 7 insertions, 7 deletions

diff --git a/test cases/common/113 generatorcustom/catter.py b/test cases/common/113 generatorcustom/catter.py
index 1ee0f53..354d6e0 100755
--- a/test cases/common/113 generatorcustom/catter.py
+++ b/test cases/common/113 generatorcustom/catter.py
@@ -2,12 +2,12 @@
 
 import sys, os
 
-output = sys.argv[1]
-inputs = sys.argv[2:]
+output = sys.argv[-1]
+inputs = sys.argv[1:-1]
 
 with open(output, 'w') as ofile:
     ofile.write('#pragma once\n')
     for i in inputs:
         content = open(i, 'r').read()
-        i.write(content)
-        i.write('\n')
+        ofile.write(content)
+        ofile.write('\n')
diff --git a/test cases/common/113 generatorcustom/gen.py b/test cases/common/113 generatorcustom/gen.py
index 2fc0fdd..ba02e3f 100755
--- a/test cases/common/113 generatorcustom/gen.py
+++ b/test cases/common/113 generatorcustom/gen.py
@@ -7,5 +7,5 @@ ofile = sys.argv[2]
 
 resname = open(ifile, 'r').readline().strip()
 
-templ = 'char %s[] = "%s";\n'
+templ = 'const char %s[] = "%s";\n'
 open(ofile, 'w').write(templ % (resname, resname))
diff --git a/test cases/common/113 generatorcustom/meson.build b/test cases/common/113 generatorcustom/meson.build
index 529f28a..1f4cc88 100644
--- a/test cases/common/113 generatorcustom/meson.build
+++ b/test cases/common/113 generatorcustom/meson.build
@@ -9,9 +9,9 @@ gen = generator(creator,
 
 hs = gen.process('res1.txt', 'res2.txt')
 
-all_headers_in_one = custom_target('alltogether',
+allinone = custom_target('alltogether',
     input : hs,
     output : 'alltogether.h',
     command : [catter, '@INPUT@', '@OUTPUT@'])
 
-executable('proggie', 'main.c', hs)
+executable('proggie', 'main.c', allinone)