diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-01-14 15:13:47 -0500 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2022-01-15 23:50:14 +0530 |
| commit | 96d000574450ed0a7a0589a069938b0f0dc5c05b (patch) | |
| tree | eca1ee208de6670352a3fcacbbd36abc8c94bb7c /mesonbuild/modules/gnome.py | |
| parent | f3a8e5d3b26410a3492952487a17909be0bfb217 (diff) | |
| download | meson-96d000574450ed0a7a0589a069938b0f0dc5c05b.zip meson-96d000574450ed0a7a0589a069938b0f0dc5c05b.tar.gz meson-96d000574450ed0a7a0589a069938b0f0dc5c05b.tar.bz2 | |
gnome.genmarshal: restore the ability to pass sources as Files objects
It used to support:
- a single string
- an array of anything
And as long as CustomTarget supported it too, everything worked fine.
So, a `files('foo')` worked but a `files('foo')[0]` did not, which is
silly... and it's not exactly terrible to use files() here, the input is
literally a list of source files.
Fixes building gnome-terminal
Fixes #9827
Test updated by Nirbheek Chauhan <nirbheek@centricular.com>
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 267c2d4..78e09e6 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -153,7 +153,7 @@ if T.TYPE_CHECKING: nostdinc: bool prefix: T.Optional[str] skip_source: bool - sources: T.List[str] + sources: T.List[FileOrString] stdinc: bool valist_marshallers: bool @@ -1813,7 +1813,7 @@ class GnomeModule(ExtensionModule): KwargInfo('nostdinc', bool, default=False), KwargInfo('prefix', (str, NoneType)), KwargInfo('skip_source', bool, default=False), - KwargInfo('sources', ContainerTypeInfo(list, str, allow_empty=False), listify=True, required=True), + KwargInfo('sources', ContainerTypeInfo(list, (str, mesonlib.File), allow_empty=False), listify=True, required=True), KwargInfo('stdinc', bool, default=False), KwargInfo('valist_marshallers', bool, default=False), ) |