Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow File arguments in extract_objects() arguments 

Passed strings are converted to Files, but passing a File directly
wasn't supported yet.
This commit is contained in:
Maarten ter Huurne 2019-02-19 01:10:35 +01:00 committed by Xavier Claessens
parent 6e15bcc504
commit 37a962e90c
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/markdown/snippets/extract_objects-file-arg.md Normal file
View File

@ -0,0 +1,4 @@
## `extract_objects` accepts `File` arguments
The `extract_objects` function now supports File objects to tell it
what to extract. Previously, file paths could only be passed as strings.

9
mesonbuild/build.py
View File

@ -722,9 +722,12 @@ class BuildTarget(Target):
def extract_objects(self, srclist): def extract_objects(self, srclist):
obj_src = [] obj_src = []
for src in srclist: for src in srclist:
if not isinstance(src, str): if isinstance(src, str):
raise MesonException('Object extraction arguments must be strings.') src = File(False, self.subdir, src)
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 # FIXME: It could be a generated source
if src not in self.sources: if src not in self.sources:
raise MesonException('Tried to extract unknown source %s.' % src) raise MesonException('Tried to extract unknown source %s.' % src)

3
test cases/common/23 object extraction/meson.build
View File

@ -8,10 +8,13 @@ else
obj1 = lib1.extract_objects('src/lib.c') obj1 = lib1.extract_objects('src/lib.c')
obj2 = lib2.extract_objects(['lib.c']) obj2 = lib2.extract_objects(['lib.c'])
obj3 = lib2.extract_objects(files('lib.c'))
e1 = executable('main1', 'main.c', objects : obj1) e1 = executable('main1', 'main.c', objects : obj1)
e2 = executable('main2', 'main.c', objects : obj2) e2 = executable('main2', 'main.c', objects : obj2)
e3 = executable('main3', 'main.c', objects : obj3)
test('extraction test 1', e1) test('extraction test 1', e1)
test('extraction test 2', e2) test('extraction test 2', e2)
test('extraction test 3', e3)
endif endif