Merge pull request #3061 from jon-turney/introspect-custom-target-files

Fix 'meson introspect --target-files' for a custom target

2 files changed, 39 insertions, 1 deletions

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index e820afb..4f09c0f 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -3252,6 +3252,12 @@ external dependencies (including libraries) must go to "dependencies".''')
         'Implementation-only, without FeatureNew checks, for internal use'
         name = args[0]
         kwargs['install_mode'] = self._get_kwarg_install_mode(kwargs)
+        if 'input' in kwargs:
+            try:
+                kwargs['input'] = self.source_strings_to_files(extract_as_list(kwargs, 'input'))
+            except mesonlib.MesonException:
+                mlog.warning('''Custom target input \'%s\' can\'t be converted to File object(s).
+This will become a hard error in the future.''' % kwargs['input'])
         tg = CustomTargetHolder(build.CustomTarget(name, self.subdir, self.subproject, kwargs), self)
         self.add_target(name, tg.held_object)
         return tg
@@ -3943,7 +3949,7 @@ Try setting b_lundef to false instead.'''.format(self.coredata.base_options['b_s
             sources = [sources]
         for s in sources:
             if isinstance(s, (mesonlib.File, GeneratedListHolder,
-                              CustomTargetHolder, CustomTargetIndexHolder)):
+                              TargetHolder, CustomTargetIndexHolder)):
                 pass
             elif isinstance(s, str):
                 self.validate_within_subproject(self.subdir, s)
diff --git a/run_unittests.py b/run_unittests.py
index d23918c..ae2c8c7 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -2473,6 +2473,38 @@ int main(int argc, char **argv) {
                 self.init(testdir, ['--cross-file=' + name], inprocess=True)
                 self.wipe()
 
+    def test_introspect_target_files(self):
+        '''
+        Tests that mesonintrospect --target-files returns expected output.
+        '''
+        testdir = os.path.join(self.common_test_dir, '8 install')
+        self.init(testdir)
+        expected = {
+            'stat@sta': ['stat.c'],
+            'prog@exe': ['prog.c'],
+        }
+        t_intro = self.introspect('--targets')
+        self.assertCountEqual([t['id'] for t in t_intro], expected)
+        for t in t_intro:
+            id = t['id']
+            tf_intro = self.introspect(['--target-files', id])
+            self.assertEqual(tf_intro, expected[id])
+        self.wipe()
+
+        testdir = os.path.join(self.common_test_dir, '53 custom target')
+        self.init(testdir)
+        expected = {
+            'bindat@cus': ['data_source.txt'],
+            'depfile@cus': [],
+        }
+        t_intro = self.introspect('--targets')
+        self.assertCountEqual([t['id'] for t in t_intro], expected)
+        for t in t_intro:
+            id = t['id']
+            tf_intro = self.introspect(['--target-files', id])
+            self.assertEqual(tf_intro, expected[id])
+        self.wipe()
+
     def test_compiler_run_command(self):
         '''
         The test checks that the compiler object can be passed to