diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-16 23:58:45 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-18 23:48:33 +0200 |
commit | 6879e84c48632bcd0f6c277e81b4032a00bb1d5c (patch) | |
tree | dd23b9d92a5ed77be94e8f601a9b21b4d86898e7 /mesonbuild/interpreter/interpreterobjects.py | |
parent | 66b32a45915238230557d8591e4521bdd7ecdb3b (diff) | |
download | meson-6879e84c48632bcd0f6c277e81b4032a00bb1d5c.zip meson-6879e84c48632bcd0f6c277e81b4032a00bb1d5c.tar.gz meson-6879e84c48632bcd0f6c277e81b4032a00bb1d5c.tar.bz2 |
holders: Move get_version from directly to ExternalProgram
Diffstat (limited to 'mesonbuild/interpreter/interpreterobjects.py')
-rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index db42c67..ac37f3a 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -520,7 +520,6 @@ class ExternalProgramHolder(ObjectHolder[ExternalProgram]): self.methods.update({'found': self.found_method, 'path': self.path_method, 'full_path': self.full_path_method}) - self.cached_version = None @noPosargs @permittedKwargs({}) @@ -558,26 +557,6 @@ class ExternalProgramHolder(ObjectHolder[ExternalProgram]): return exe.name return exe.get_name() - def get_version(self, interpreter): - if isinstance(self.held_object, build.Executable): - return self.held_object.project_version - if not self.cached_version: - raw_cmd = self.get_command() + ['--version'] - cmd = [self, '--version'] - res = interpreter.run_command_impl(interpreter.current_node, cmd, {}, True) - if res.returncode != 0: - m = 'Running {!r} failed' - raise InterpreterException(m.format(raw_cmd)) - output = res.stdout.strip() - if not output: - output = res.stderr.strip() - match = re.search(r'([0-9][0-9\.]+)', output) - if not match: - m = 'Could not find a version number in output of {!r}' - raise InterpreterException(m.format(raw_cmd)) - self.cached_version = match.group(1) - return self.cached_version - class ExternalLibraryHolder(ObjectHolder[ExternalLibrary]): def __init__(self, el: ExternalLibrary, subproject: str): super().__init__(el, subproject=subproject) |