diff options
| -rw-r--r-- | mesonbuild/backend/backends.py | 12 | ||||
| -rw-r--r-- | mesonbuild/utils/core.py | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 268192432..62cf16296 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -510,8 +510,8 @@ class Backend: self, cmd: T.Sequence[T.Union[programs.ExternalProgram, build.BuildTarget, build.CustomTarget, File, str]], workdir: T.Optional[str] = None, extra_bdeps: T.Optional[T.List[build.BuildTarget]] = None, - capture: T.Optional[bool] = None, - feed: T.Optional[bool] = None, + capture: T.Optional[str] = None, + feed: T.Optional[str] = None, env: T.Optional[mesonlib.EnvironmentVariables] = None, tag: T.Optional[str] = None, verbose: bool = False, @@ -582,8 +582,8 @@ class Backend: cmd_args: T.Sequence[T.Union[str, mesonlib.File, build.BuildTarget, build.CustomTarget, programs.ExternalProgram]], workdir: T.Optional[str] = None, extra_bdeps: T.Optional[T.List[build.BuildTarget]] = None, - capture: T.Optional[bool] = None, - feed: T.Optional[bool] = None, + capture: T.Optional[str] = None, + feed: T.Optional[str] = None, force_serialize: bool = False, env: T.Optional[mesonlib.EnvironmentVariables] = None, verbose: bool = False) -> T.Tuple[T.Sequence[T.Union[str, File, build.Target, programs.ExternalProgram]], str]: @@ -638,9 +638,9 @@ class Backend: return es.cmd_args, '' args: T.List[str] = [] if capture: - args += ['--capture', str(capture)] + args += ['--capture', capture] if feed: - args += ['--feed', str(feed)] + args += ['--feed', feed] return ( self.environment.get_build_command() + ['--internal', 'exe'] + args + ['--'] + es.cmd_args, diff --git a/mesonbuild/utils/core.py b/mesonbuild/utils/core.py index eee88b94d..6e2ec6ac2 100644 --- a/mesonbuild/utils/core.py +++ b/mesonbuild/utils/core.py @@ -141,15 +141,13 @@ class EnvironmentVariables(HoldableObject): @dataclass(eq=False) class ExecutableSerialisation: - # XXX: should capture and feed default to False, instead of None? - cmd_args: T.List[str] env: T.Optional[EnvironmentVariables] = None exe_wrapper: T.Optional['programs.ExternalProgram'] = None workdir: T.Optional[str] = None extra_paths: T.Optional[T.List] = None - capture: T.Optional[bool] = None - feed: T.Optional[bool] = None + capture: T.Optional[str] = None + feed: T.Optional[str] = None tag: T.Optional[str] = None verbose: bool = False installdir_map: T.Optional[T.Dict[str, str]] = None |