aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/build.py
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-10-07 14:30:59 +0200
committerDylan Baker <dylan@pnwbakers.com>2021-12-06 13:27:12 -0800
commit901f444ea585c3661eb3284098cac4ab64df4ec8 (patch)
tree4acabc044d7e1ea0d42a116fe4e2fab589d183d5 /mesonbuild/build.py
parent18408f82d1ed2f04ef069e8e5836449a9cc5c355 (diff)
downloadmeson-901f444ea585c3661eb3284098cac4ab64df4ec8.zip
meson-901f444ea585c3661eb3284098cac4ab64df4ec8.tar.gz
meson-901f444ea585c3661eb3284098cac4ab64df4ec8.tar.bz2
interpreter: allow extract_objects to receive generated sources
Fixes: #8333
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r--mesonbuild/build.py33
1 files changed, 21 insertions, 12 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 54735c2..6515f42 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -987,21 +987,30 @@ class BuildTarget(Target):
if t in self.kwargs:
self.kwargs[t] = listify(self.kwargs[t], flatten=True)
- def extract_objects(self, srclist: T.List['FileOrString']) -> ExtractedObjects:
- obj_src: T.List['File'] = []
+ def extract_objects(self, srclist: T.List[T.Union['FileOrString', 'GeneratedTypes']]) -> ExtractedObjects:
sources_set = set(self.sources)
+ generated_set = set(self.generated)
+
+ obj_src: T.List['File'] = []
+ obj_gen: T.List['GeneratedTypes'] = []
for src in srclist:
- if isinstance(src, str):
- src = File(False, self.subdir, src)
- elif isinstance(src, File):
- FeatureNew.single_use('File argument for extract_objects', '0.50.0', self.subproject)
+ if isinstance(src, (str, File)):
+ if isinstance(src, str):
+ src = File(False, self.subdir, src)
+ else:
+ FeatureNew.single_use('File argument for extract_objects', '0.50.0', self.subproject)
+ if src not in sources_set:
+ raise MesonException(f'Tried to extract unknown source {src}.')
+ obj_src.append(src)
+ elif isinstance(src, (CustomTarget, CustomTargetIndex, GeneratedList)):
+ FeatureNew.single_use('Generated sources for extract_objects', '0.61.0', self.subproject)
+ target = src.target if isinstance(src, CustomTargetIndex) else src
+ if src not in generated_set and target not in generated_set:
+ raise MesonException(f'Tried to extract unknown source {target.get_basename()}.')
+ obj_gen.append(src)
else:
- raise MesonException(f'Object extraction arguments must be strings or Files (got {type(src).__name__}).')
- # FIXME: It could be a generated source
- if src not in sources_set:
- raise MesonException(f'Tried to extract unknown source {src}.')
- obj_src.append(src)
- return ExtractedObjects(self, obj_src)
+ raise MesonException(f'Object extraction arguments must be strings, Files or targets (got {type(src).__name__}).')
+ return ExtractedObjects(self, obj_src, obj_gen)
def extract_all_objects(self, recursive: bool = True) -> ExtractedObjects:
return ExtractedObjects(self, self.sources, self.generated, self.objects,