aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Brunet <charles.brunet@optelgroup.com>2023-07-10 12:26:23 -0400
committerEli Schwartz <eschwartz93@gmail.com>2023-07-13 13:26:33 -0400
commit3e3d5e97c37a924478aef77806427a68f3f395b6 (patch)
tree34440bcc3c313aa41f476676b8d54eedf0bc0664
parent3784f729731c6fd1aacc6e9fe26f9a7e363c56b1 (diff)
downloadmeson-3e3d5e97c37a924478aef77806427a68f3f395b6.zip
meson-3e3d5e97c37a924478aef77806427a68f3f395b6.tar.gz
meson-3e3d5e97c37a924478aef77806427a68f3f395b6.tar.bz2
Fix display of generator
-rw-r--r--mesonbuild/backend/ninjabackend.py4
-rw-r--r--mesonbuild/build.py6
2 files changed, 8 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index e473499..f211f16 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2659,10 +2659,10 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
what = f'{sole_output!r}'
else:
# since there are multiple outputs, we log the source that caused the rebuild
- what = f'from {sole_output!r}.'
+ what = f'from {sole_output!r}'
if reason:
reason = f' (wrapped by meson {reason})'
- elem.add_item('DESC', f'Generating {what}{reason}.')
+ elem.add_item('DESC', f'Generating {what}{reason}')
if isinstance(exe, build.BuildTarget):
elem.add_dep(self.get_target_filename(exe))
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 3cb4a22..0a4160f 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -1716,6 +1716,9 @@ class FileInTargetPrivateDir:
def __init__(self, fname: str):
self.fname = fname
+ def __str__(self) -> str:
+ return self.fname
+
class FileMaybeInTargetPrivateDir:
"""Union between 'File' and 'FileInTargetPrivateDir'"""
@@ -1736,6 +1739,9 @@ class FileMaybeInTargetPrivateDir:
raise RuntimeError('Unreachable code')
return self.inner.absolute_path(srcdir, builddir)
+ def __str__(self) -> str:
+ return self.fname
+
class Generator(HoldableObject):
def __init__(self, exe: T.Union['Executable', programs.ExternalProgram],
arguments: T.List[str],