diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-30 20:58:25 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-05-04 00:17:33 +0300 |
| commit | 108dac5c162eb086b8cce3f4d0575f7282c72c48 (patch) | |
| tree | 91b2b6f245933d178a1211867b0dacf0b596a2bf /mesonbuild/build.py | |
| parent | 8f4976489627e8a94744ca06e59ea9363e0b379a (diff) | |
| download | meson-108dac5c162eb086b8cce3f4d0575f7282c72c48.zip meson-108dac5c162eb086b8cce3f4d0575f7282c72c48.tar.gz meson-108dac5c162eb086b8cce3f4d0575f7282c72c48.tar.bz2 | |
Store extra_files as file objects. Helps with #1686.
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 c8d692e..7dc0bc7 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -648,12 +648,11 @@ class BuildTarget(Target): elif 'gui_app' in kwargs: raise InvalidArguments('Argument gui_app can only be used on executables.') extra_files = kwargs.get('extra_files', []) - if isinstance(extra_files, str): + if not isinstance(extra_files, list): extra_files = [extra_files] for i in extra_files: - if not isinstance(i, str): - raise InvalidArguments('Arguments to extra_files must be strings.') - trial = os.path.join(environment.get_source_dir(), self.subdir, i) + assert(isinstance(i, File)) + trial = os.path.join(environment.get_source_dir(), i.subdir, i.fname) if not(os.path.isfile(trial)): raise InvalidArguments('Tried to add non-existing extra file %s.' % i) self.extra_files = extra_files |