diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-09-15 16:02:12 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-09-15 16:23:20 +0100 |
| commit | e702d754b150dea00dcdf0956bc958d059e47ce9 (patch) | |
| tree | 74a555c1d1b20c3ce9b1c0946bcac523a81f1e79 | |
| parent | 0a1468f8f3a3f64bf2a02a594c705ebb81c8c1f7 (diff) | |
| download | meson-e702d754b150dea00dcdf0956bc958d059e47ce9.zip meson-e702d754b150dea00dcdf0956bc958d059e47ce9.tar.gz meson-e702d754b150dea00dcdf0956bc958d059e47ce9.tar.bz2 | |
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
| -rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 5 insertions, 1 deletions
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 |