Skip to content

Commit

Permalink
build: configure formatting, add final message
Browse files Browse the repository at this point in the history
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: #638
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
silverwind authored and bnoordhuis committed Jan 28, 2015
1 parent dd47a8c commit 6ad236c
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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++')
Expand Down Expand Up @@ -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."""
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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))

0 comments on commit 6ad236c

Please sign in to comment.