From e702d754b150dea00dcdf0956bc958d059e47ce9 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sat, 15 Sep 2018 16:02:12 +0100 Subject: Tolerate custom target sources which can't be converted to Files For backwards compatibility, tolerate but warn about custom target sources which can't be converted to Files --- mesonbuild/interpreter.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 76e4439..1d6d670 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3232,7 +3232,11 @@ root and issuing %s. name = args[0] kwargs['install_mode'] = self._get_kwarg_install_mode(kwargs) if 'input' in kwargs: - kwargs['input'] = self.source_strings_to_files(extract_as_list(kwargs, 'input')) + 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 -- cgit v1.1