fix up some message strings that don't include "setup" in the configure command

pull/10718/head
Eli Schwartz 2 years ago
parent a572734330
commit d395b1a768
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
  1. 2
      mesonbuild/build.py
  2. 2
      mesonbuild/msetup.py

@ -2917,7 +2917,7 @@ def load(build_dir: str) -> Build:
f"Build data file {filename!r} references functions or classes that don't " f"Build data file {filename!r} references functions or classes that don't "
"exist. This probably means that it was generated with an old " "exist. This probably means that it was generated with an old "
"version of meson. Try running from the source directory " "version of meson. Try running from the source directory "
f"meson {build_dir} --wipe") f"meson setup {build_dir} --wipe")
if not isinstance(obj, Build): if not isinstance(obj, Build):
raise MesonException(load_fail_msg) raise MesonException(load_fail_msg)
return obj return obj

@ -165,7 +165,7 @@ class MesonApp:
if not reconfigure and not wipe: if not reconfigure and not wipe:
print('Directory already configured.\n' print('Directory already configured.\n'
'\nJust run your build command (e.g. ninja) and Meson will regenerate as necessary.\n' '\nJust run your build command (e.g. ninja) and Meson will regenerate as necessary.\n'
'If ninja fails, run "ninja reconfigure" or "meson --reconfigure"\n' 'If ninja fails, run "ninja reconfigure" or "meson setup --reconfigure"\n'
'to force Meson to regenerate.\n' 'to force Meson to regenerate.\n'
'\nIf build failures persist, run "meson setup --wipe" to rebuild from scratch\n' '\nIf build failures persist, run "meson setup --wipe" to rebuild from scratch\n'
'using the same options as passed when configuring the build.' 'using the same options as passed when configuring the build.'

Loading…
Cancel
Save