diff options
| author | Florian "sp1rit" <sp1rit@disroot.org> | 2025-07-02 10:43:43 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-08-01 13:27:49 +0300 |
| commit | a0c8af21ec5a70259998b5fa6b95e04078f3ce6d (patch) | |
| tree | 2dac47416460446781446fc38cd05e92e1ddf332 /mesonbuild | |
| parent | 51781584d2f31a611f52ede45ae0f782e05e1f8c (diff) | |
| download | meson-a0c8af21ec5a70259998b5fa6b95e04078f3ce6d.tar.gz | |
gnome: make ToolType an alias and use it
Co-authored-by: Dylan Baker <dylan@pnwbakers.com>
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index a2feb248b..7ae66930a 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -37,7 +37,7 @@ from ..programs import ExternalProgram, OverrideProgram from ..scripts.gettext import read_linguas if T.TYPE_CHECKING: - from typing_extensions import Literal, TypedDict + from typing_extensions import Literal, TypeAlias, TypedDict from . import ModuleState from ..build import BuildTarget @@ -197,7 +197,7 @@ if T.TYPE_CHECKING: vtail: T.Optional[str] depends: T.List[T.Union[BuildTarget, CustomTarget, CustomTargetIndex]] - ToolType = T.Union[OverrideExecutable, ExternalProgram, OverrideProgram] + ToolType: TypeAlias = T.Union[OverrideExecutable, ExternalProgram, OverrideProgram] # Differs from the CustomTarget version in that it straight defaults to True @@ -254,8 +254,8 @@ class GnomeModule(ExtensionModule): def __init__(self, interpreter: 'Interpreter') -> None: super().__init__(interpreter) - self.giscanner: T.Optional[T.Union[ExternalProgram, OverrideExecutable, OverrideProgram]] = None - self.gicompiler: T.Optional[T.Union[ExternalProgram, OverrideExecutable, OverrideProgram]] = None + self.giscanner: T.Optional[ToolType] = None + self.gicompiler: T.Optional[ToolType] = None self.install_glib_compile_schemas = False self.install_gio_querymodules: T.List[str] = [] self.install_gtk_update_icon_cache = False @@ -787,8 +787,7 @@ class GnomeModule(ExtensionModule): if self.devenv is not None: b.devenv.append(self.devenv) - def _get_gi(self, state: 'ModuleState') -> T.Tuple[T.Union[OverrideExecutable, 'ExternalProgram', 'OverrideProgram'], - T.Union[OverrideExecutable, 'ExternalProgram', 'OverrideProgram']]: + def _get_gi(self, state: 'ModuleState') -> T.Tuple[ToolType, ToolType]: if not self.giscanner: self.giscanner = self._find_tool(state, 'g-ir-scanner', for_machine=MachineChoice.BUILD) self.gicompiler = self._find_tool(state, 'g-ir-compiler', for_machine=MachineChoice.HOST) |