From 6ad236c9b6a344a88ec2f1f173d5f920984b77b7 Mon Sep 17 00:00:00 2001 From: Roman Reiss Date: Wed, 28 Jan 2015 17:46:19 +0100 Subject: [PATCH] build: configure formatting, add final message This restores the pretty-printed options output for improved readability and adds a final warning message to inform on possibly scrolled-off warnings. PR-URL: https://github.com/iojs/io.js/pull/638 Reviewed-By: Ben Noordhuis --- configure | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index fb271c6..e85621e 100755 --- a/configure +++ b/configure @@ -8,7 +8,6 @@ import subprocess import sys import shutil import string -import textwrap CC = os.environ.get('CC', 'cc') CXX = os.environ.get('CXX', 'c++') @@ -297,9 +296,12 @@ auto_downloads = nodedownload.parse(options.download_list) def warn(msg): - prefix = '\033[1m\033[91mWARNING\033[0m' if os.isatty(1) else 'WARNING' + warn.warned = True + prefix = '\033[1m\033[93mWARNING\033[0m' if os.isatty(1) else 'WARNING' print('%s: %s' % (prefix, msg)) +# track if warnings occured +warn.warned = False def b(value): """Returns the string 'true' if value is truthy, 'false' otherwise.""" @@ -960,7 +962,7 @@ output = { 'variables': variables, 'target_defaults': output } -print textwrap.fill(str(output), 78) +pprint.pprint(output, indent=2) write('config.gypi', do_not_edit + pprint.pformat(output, indent=2) + '\n') @@ -990,4 +992,7 @@ else: gyp_args += args +if warn.warned: + warn('warnings were emitted in the configure phase') + sys.exit(subprocess.call(gyp_args)) -- 2.7.4