diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2021-06-01 21:25:50 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2021-06-15 12:48:53 -0700 |
commit | 5952dc9818051de01aea79616b08426eecf4df97 (patch) | |
tree | 645d41bb85a155d0be8c52e2aab710de86b0e93f /mesonbuild/build.py | |
parent | 2043461b87eb93a50fc2ede3783efb157261ed86 (diff) | |
download | meson-5952dc9818051de01aea79616b08426eecf4df97.zip meson-5952dc9818051de01aea79616b08426eecf4df97.tar.gz meson-5952dc9818051de01aea79616b08426eecf4df97.tar.bz2 |
interpreter|build: use typed_pos_args and unholder in the interpreter
For generator.process_files. Just cleaner and nicer
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r-- | mesonbuild/build.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 24cddb0..9d1c0f9 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1543,11 +1543,12 @@ class Generator: relpath = pathlib.PurePath(trial).relative_to(parent) return relpath.parts[0] != '..' # For subdirs we can only go "down". - def process_files(self, files, state, preserve_path_from=None, extra_args=None): + def process_files(self, files: T.List[T.Union[str, File, 'CustomTarget', 'CustomTargetIndex', 'GeneratedList']], + state, preserve_path_from=None, extra_args=None): new = False output = GeneratedList(self, state.subdir, preserve_path_from, extra_args=extra_args if extra_args is not None else []) #XXX - for e in unholder(files): + for e in files: fs = [e] if isinstance(e, CustomTarget): output.depends.add(e) @@ -1561,8 +1562,6 @@ class Generator: new = True elif isinstance(e, str): fs = [File.from_source_file(state.environment.source_dir, state.subdir, e)] - elif not isinstance(e, File): - raise InvalidArguments(f'{self.name} arguments must be strings, files or CustomTargets, not {e!r}.') for f in fs: if preserve_path_from: |