aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Gurevitch <chetgurevitch@protonmail.com>2017-09-10 17:32:36 -0700
committerJussi Pakkanen <jpakkane@gmail.com>2017-09-12 20:30:26 +0300
commite5e060a6b7c18a2853c98f1775a6116c0c01f63e (patch)
treeca21f057dcd27e76609555008d14109517cc016e
parent540c928e3009040a520459d2993a9dfa021c1a1a (diff)
downloadmeson-e5e060a6b7c18a2853c98f1775a6116c0c01f63e.zip
meson-e5e060a6b7c18a2853c98f1775a6116c0c01f63e.tar.gz
meson-e5e060a6b7c18a2853c98f1775a6116c0c01f63e.tar.bz2
Update message for already configured builddir
-rw-r--r--mesonbuild/mesonmain.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index ec2bc58..6acc8d7 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -121,13 +121,12 @@ class MesonApp:
priv_dir = os.path.join(build_dir, 'meson-private/coredata.dat')
if os.path.exists(priv_dir):
if not handshake:
- print('''Trying to run Meson on a build directory that has already been configured.
-If you want to build it, just run your build command (e.g. ninja) inside the
-build directory. Meson will autodetect any changes in your setup and regenerate
-itself as required. Though it shouldn't be necessary, running ninja reconfigure
-will force Meson to regenerate the build files.
-
-If you want to change option values, use meson configure instead.''')
+ print('Directory already configured, exiting Meson. Just run your build command\n'
+ '(e.g. ninja) and Meson will regenerate as necessary. If ninja fails, run ninja\n'
+ 'reconfigure to force Meson to regenerate.\n'
+ '\nIf build failures persist, manually wipe your build directory to clear any\n'
+ 'stored system data.\n'
+ '\nTo change option values, run meson configure instead.')
sys.exit(0)
else:
if handshake: