diff options
| author | Maarten ter Huurne <maarten@treewalker.org> | 2019-02-19 01:10:35 +0100 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2019-02-19 10:02:30 -0500 |
| commit | 37a962e90c38f094819973d5d45fa25054caa1ca (patch) | |
| tree | b93829b0b0cfdddcd71e0f33a48a869b505a2ff0 /mesonbuild/build.py | |
| parent | 6e15bcc5045b6092a27b83e402007c9beca27abb (diff) | |
| download | meson-37a962e90c38f094819973d5d45fa25054caa1ca.zip meson-37a962e90c38f094819973d5d45fa25054caa1ca.tar.gz meson-37a962e90c38f094819973d5d45fa25054caa1ca.tar.bz2 | |
Allow File arguments in extract_objects() arguments
Passed strings are converted to Files, but passing a File directly
wasn't supported yet.
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 702b338..e8aa8f4 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -722,9 +722,12 @@ class BuildTarget(Target): def extract_objects(self, srclist): obj_src = [] for src in srclist: - if not isinstance(src, str): - raise MesonException('Object extraction arguments must be strings.') - src = File(False, self.subdir, src) + if isinstance(src, str): + src = File(False, self.subdir, src) + elif isinstance(src, File): + FeatureNew('File argument for extract_objects', '0.50.0').use(self.subproject) + else: + raise MesonException('Object extraction arguments must be strings or Files.') # FIXME: It could be a generated source if src not in self.sources: raise MesonException('Tried to extract unknown source %s.' % src) |