Skip to content

Commit

Permalink
Revert "build: add --verbose to ./configure"
Browse files Browse the repository at this point in the history
This reverts commit 62a3f9b.

The change should have been semver-major.

PR-URL: #23313
  • Loading branch information
targos committed Oct 10, 2018
1 parent 7c0d6ac commit d16486b
Showing 1 changed file with 12 additions and 28 deletions.
40 changes: 12 additions & 28 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -559,12 +559,6 @@
default=False,
help='build V8 using GN instead of gyp')

parser.add_option('--verbose',
action='store_true',
dest='verbose',
default=False,
help='get more output from this script')

# Create compile_commands.json in out/Debug and out/Release.
parser.add_option('-C',
action='store_true',
Expand Down Expand Up @@ -593,14 +587,6 @@ def warn(msg):
# track if warnings occurred
warn.warned = False

def print_verbose(x):
if not options.verbose:
return
if type(x) is str:
print x
else:
pprint.pprint(x, indent=2)

def b(value):
"""Returns the string 'true' if value is truthy, 'false' otherwise."""
if value:
Expand Down Expand Up @@ -1213,7 +1199,7 @@ def without_ssl_error(option):
def configure_static(o):
if options.fully_static or options.partly_static:
if flavor == 'mac':
warn("Generation of static executable will not work on OSX "
print("Generation of static executable will not work on OSX "
"when using the default compilation environment")
return

Expand All @@ -1226,9 +1212,9 @@ def configure_static(o):


def write(filename, data):
print_verbose('creating %s' % filename)
with open(filename, 'w+') as f:
f.write(data)
print('creating %s' % filename)
f = open(filename, 'w+')
f.write(data)

do_not_edit = '# Do not edit. Generated by the configure script.\n'

Expand All @@ -1246,7 +1232,7 @@ def glob_to_var(dir_base, dir_sub, patch_dir):
patchfile = '%s/%s/%s' % (dir_base, patch_dir, file)
if os.path.isfile(patchfile):
srcfile = '%s/%s' % (patch_dir, file)
warn('Using floating patch "%s" from "%s"' % (patchfile, dir_base))
print('Using version-specific floating patch %s' % patchfile)
list.append(srcfile)
break
return list
Expand Down Expand Up @@ -1280,8 +1266,8 @@ def icu_download(path):
if (md5 == gotmd5):
return targetfile
else:
error('Expected: %s *MISMATCH*' % md5)
error('\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile)
print('Expected: %s *MISMATCH*' % md5)
print('\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile)
return None
icu_config = {
'variables': {}
Expand Down Expand Up @@ -1382,7 +1368,7 @@ def write_config(data, name):
# --with-icu-source processing
# now, check that they didn't pass --with-icu-source=deps/icu
elif with_icu_source and os.path.abspath(icu_full_path) == os.path.abspath(with_icu_source):
warn('Ignoring redundant --with-icu-source=%s' % with_icu_source)
print('Ignoring redundant --with-icu-source=%s' % with_icu_source)
with_icu_source = None
# if with_icu_source is still set, try to use it.
if with_icu_source:
Expand Down Expand Up @@ -1425,7 +1411,7 @@ def write_config(data, name):
# ICU source dir relative to tools/icu (for .gyp file)
o['variables']['icu_path'] = icu_full_path
if not os.path.isdir(icu_full_path):
warn('* ECMA-402 (Intl) support didn\'t find ICU in %s..' % icu_full_path)
print('* ECMA-402 (Intl) support didn\'t find ICU in %s..' % icu_full_path)
# can we download (or find) a zipfile?
localzip = icu_download(icu_full_path)
if localzip:
Expand All @@ -1434,7 +1420,7 @@ def write_config(data, name):
error('''Cannot build Intl without ICU in %s.
Fix, or disable with "--with-intl=none"''' % icu_full_path)
else:
print_verbose('* Using ICU in %s' % icu_full_path)
print('* Using ICU in %s' % icu_full_path)
# Now, what version of ICU is it? We just need the "major", such as 54.
# uvernum.h contains it as a #define.
uvernum_h = os.path.join(icu_full_path, 'source/common/unicode/uvernum.h')
Expand Down Expand Up @@ -1597,7 +1583,7 @@ def make_bin_override():
if make_global_settings:
output['make_global_settings'] = make_global_settings

print_verbose(output)
pprint.pprint(output, indent=2)

write('config.gypi', do_not_edit +
pprint.pformat(output, indent=2) + '\n')
Expand Down Expand Up @@ -1636,11 +1622,9 @@ def make_bin_override():
if options.compile_commands_json:
gyp_args += ['-f', 'compile_commands_json']

# pass the leftover positional arguments to GYP
gyp_args += args

if warn.warned and not options.verbose:
if warn.warned:
warn('warnings were emitted in the configure phase')

print_verbose("running: \n " + " ".join(['python', 'tools/gyp_node.py'] + gyp_args))
run_gyp(gyp_args)

0 comments on commit d16486b

Please sign in to comment.