1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gyp: muffle xcodebuild warnings

Browse Source 
Muffle xcodebuild warnings by introducing an alternative quieter
alternative to GetStdout, called GetStdoutQuiet, and call it selectively
in particularly noisy xcodebuild commands.

Co-authored-by: Gibson Fahnestock <gibfahn@gmail.com>

PR-URL: https://github.com/nodejs/node/pull/21999
Original-PR-URL: https://github.com/nodejs/node-gyp/pull/1370
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Ujjwal Sharma 2018-07-27 15:03:19 +05:30
parent 376cc4d0b7
commit 16cffb0d48
No known key found for this signature in database
GPG Key ID: 1FD3B47B83F46621
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/gyp/pylib/gyp/xcode_emulation.py
View File

@ -495,7 +495,7 @@ class XcodeSettings(object):
# Since the CLT has no SDK paths anyway, returning None is the # Since the CLT has no SDK paths anyway, returning None is the
# most sensible route and should still do the right thing. # most sensible route and should still do the right thing.
try: try:
return GetStdout(['xcrun', '--sdk', sdk, infoitem]) return GetStdoutQuiet(['xcrun', '--sdk', sdk, infoitem])
except: except:
pass pass
@ -1394,7 +1394,7 @@ def XcodeVersion():
if XCODE_VERSION_CACHE: if XCODE_VERSION_CACHE:
return XCODE_VERSION_CACHE return XCODE_VERSION_CACHE
try: try:
version_list = GetStdout(['xcodebuild', '-version']).splitlines() version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
# In some circumstances xcodebuild exits 0 but doesn't return # In some circumstances xcodebuild exits 0 but doesn't return
# the right results; for example, a user on 10.7 or 10.8 with # the right results; for example, a user on 10.7 or 10.8 with
# a bogus path set via xcode-select # a bogus path set via xcode-select
@ -1444,6 +1444,18 @@ def CLTVersion():
continue continue
def GetStdoutQuiet(cmdlist):
"""Returns the content of standard output returned by invoking |cmdlist|.
Ignores the stderr.
Raises |GypError| if the command return with a non-zero return code."""
job = subprocess.Popen(cmdlist, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
out = job.communicate()[0]
if job.returncode != 0:
raise GypError('Error %d running %s' % (job.returncode, cmdlist[0]))
return out.rstrip('\n')
def GetStdout(cmdlist): def GetStdout(cmdlist):
"""Returns the content of standard output returned by invoking |cmdlist|. """Returns the content of standard output returned by invoking |cmdlist|.
Raises |GypError| if the command return with a non-zero return code.""" Raises |GypError| if the command return with a non-zero return code."""