diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-01-11 21:49:34 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-01-11 22:28:00 -0800 |
| commit | bcfb4d0f46608db46cd8881e2a02ba6c33ff066e (patch) | |
| tree | 1db5bd1ba9a31003200aeaaa7eca059fd279b6b8 /mesonbuild/modules/gnome.py | |
| parent | 704e9802c9f424a57c32d9e63ececfece807529a (diff) | |
| download | meson-bcfb4d0f46608db46cd8881e2a02ba6c33ff066e.zip meson-bcfb4d0f46608db46cd8881e2a02ba6c33ff066e.tar.gz meson-bcfb4d0f46608db46cd8881e2a02ba6c33ff066e.tar.bz2 | |
gnome.gtkdoc: fix passing file arguments as a configured file
Fixes gtk3 build, which uses typesfile.
All these arguments are processed by a function that explicitly handles
both str and File, and converts them to absolute paths. They clearly
need to handle File objects.
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index b2224da..196f538 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -119,9 +119,9 @@ if T.TYPE_CHECKING: install_dir: T.List[str] check: bool install: bool - gobject_typesfile: T.List[str] - html_assets: T.List[str] - expand_content_files: T.List[str] + gobject_typesfile: T.List[FileOrString] + html_assets: T.List[FileOrString] + expand_content_files: T.List[FileOrString] c_args: T.List[str] include_directories: T.List[T.Union[str, build.IncludeDirs]] dependencies: T.List[T.Union[Dependency, build.SharedLibrary, build.StaticLibrary]] @@ -1259,11 +1259,11 @@ class GnomeModule(ExtensionModule): 'dependencies', ContainerTypeInfo(list, (Dependency, build.SharedLibrary, build.StaticLibrary)), listify=True, default=[]), - KwargInfo('expand_content_files', ContainerTypeInfo(list, str), default=[], listify=True), + KwargInfo('expand_content_files', ContainerTypeInfo(list, (str, mesonlib.File)), default=[], listify=True), KwargInfo('fixxref_args', ContainerTypeInfo(list, str), default=[], listify=True), - KwargInfo('gobject_typesfile', ContainerTypeInfo(list, str), default=[], listify=True), + KwargInfo('gobject_typesfile', ContainerTypeInfo(list, (str, mesonlib.File)), default=[], listify=True), KwargInfo('html_args', ContainerTypeInfo(list, str), default=[], listify=True), - KwargInfo('html_assets', ContainerTypeInfo(list, str), default=[], listify=True), + KwargInfo('html_assets', ContainerTypeInfo(list, (str, mesonlib.File)), default=[], listify=True), KwargInfo('ignore_headers', ContainerTypeInfo(list, str), default=[], listify=True), KwargInfo( 'include_directories', |