tools: pull xcode_emulation.py from node-gyp

PR-URL: #30272Fixes: #30129
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

Author: cclauss

tools/gyp/pylib/gyp/mac_tool.py

@@ -24,6 +24,8 @@
 importsys
 importtempfile
 
+PY3=bytes!=str
+
 
 defmain(args):
 executor=MacTool()
@@ -263,6 +265,8 @@ def ExecFilterLibtool(self, *cmd_list):
 env['ZERO_AR_DATE'] ='1'
 libtoolout=subprocess.Popen(cmd_list, stderr=subprocess.PIPE, env=env)
 _, err=libtoolout.communicate()
+ifPY3:
+err=err.decode('utf-8')
 forlineinerr.splitlines():
 ifnotlibtool_re.match(line) andnotlibtool_re5.match(line):
 print(line, file=sys.stderr)

tools/gyp/pylib/gyp/xcode_emulation.py

@@ -20,6 +20,8 @@
 importtempfile
 fromgyp.commonimportGypError
 
+PY3=bytes!=str
+
 # Populated lazily by XcodeVersion, for efficiency, and to fix an issue when
 # "xcodebuild" is called too quickly (it has been found to return incorrect
 # version number).
@@ -498,7 +500,7 @@ def _GetSdkVersionInfoItem(self, sdk, infoitem):
 # most sensible route and should still do the right thing.
 try:
 returnGetStdoutQuiet(['xcrun', '--sdk', sdk, infoitem])
-except:
+exceptGypError:
 pass
 
 def_SdkRoot(self, configname):
@@ -928,7 +930,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
 # extensions and provide loader and main function.
 # These flags reflect the compilation options used by xcode to compile
 # extensions.
-ifXcodeVersion() <'0900':
+xcode_version, _=XcodeVersion()
+ifxcode_version<'0900':
 ldflags.append('-lpkstart')
 ldflags.append(sdk_root+
 '/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit')
@@ -1204,8 +1207,8 @@ def GetExtraPlistItems(self, configname=None):
 cache= {}
 cache['BuildMachineOSBuild'] =self._BuildMachineOSBuild()
 
-xcode, xcode_build=XcodeVersion()
-cache['DTXcode'] =xcode
+xcode_version, xcode_build=XcodeVersion()
+cache['DTXcode'] =xcode_version
 cache['DTXcodeBuild'] =xcode_build
 compiler=self.xcode_settings[configname].get('GCC_VERSION')
 ifcompilerisnotNone:
@@ -1216,10 +1219,10 @@ def GetExtraPlistItems(self, configname=None):
 sdk_root=self._DefaultSdkRoot()
 sdk_version=self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-version')
 cache['DTSDKName'] =sdk_root+ (sdk_versionor'')
-ifxcode>='0720':
+ifxcode_version>='0720':
 cache['DTSDKBuild'] =self._GetSdkVersionInfoItem(
 sdk_root, '--show-sdk-build-version')
-elifxcode>='0430':
+elifxcode_version>='0430':
 cache['DTSDKBuild'] =sdk_version
 else:
 cache['DTSDKBuild'] =cache['BuildMachineOSBuild']
@@ -1254,7 +1257,7 @@ def _DefaultSdkRoot(self):
  project, then the environment variable was empty. Starting with this
  version, Xcode uses the name of the newest SDK installed.
  """
-xcode_version, xcode_build=XcodeVersion()
+xcode_version, _=XcodeVersion()
 ifxcode_version<'0500':
 return''
 default_sdk_path=self._XcodeSdkPath('')
@@ -1263,7 +1266,7 @@ def _DefaultSdkRoot(self):
 returndefault_sdk_root
 try:
 all_sdks=GetStdout(['xcodebuild', '-showsdks'])
-except:
+exceptGypError:
 # If xcodebuild fails, there will be no valid SDKs
 return''
 forlineinall_sdks.splitlines():
@@ -1391,10 +1394,12 @@ def XcodeVersion():
 # Xcode 3.2.6
 # Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
 # BuildVersion: 10M2518
-# Convert that to '0463', '4H1503'.
+# Convert that to ('0463', '4H1503') or ('0326', '10M2518').
 globalXCODE_VERSION_CACHE
 ifXCODE_VERSION_CACHE:
 returnXCODE_VERSION_CACHE
+version=""
+build=""
 try:
 version_list=GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
 # In some circumstances xcodebuild exits 0 but doesn't return
@@ -1404,21 +1409,16 @@ def XcodeVersion():
 # checking that version.
 iflen(version_list) <2:
 raiseGypError("xcodebuild returned unexpected results")
-except:
-version=CLTVersion()
-ifversion:
-version=re.match(r'(\d+\.\d+\.?\d*)', version).groups()[0]
-else:
+version=version_list[0].split()[-1] # Last word on first line
+build=version_list[-1].split()[-1] # Last word on last line
+exceptGypError: # Xcode not installed so look for XCode Command Line Tools
+version=CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
+ifnotversion:
 raiseGypError("No Xcode or CLT version detected!")
-# The CLT has no build information, so we return an empty string.
-version_list= [version, '']
-version=version_list[0]
-build=version_list[-1]
-# Be careful to convert "4.2" to "0420":
-version=version.split()[-1].replace('.', '')
-version= (version+'0'* (3-len(version))).zfill(4)
-ifbuild:
-build=build.split()[-1]
+# Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
+version=version.split(".")[:3] # Just major, minor, micro
+version[0] =version[0].zfill(2) # Add a leading zero if major is one digit
+version= ("".join(version) +"00")[:4] # Limit to exactly four characters
 XCODE_VERSION_CACHE= (version, build)
 returnXCODE_VERSION_CACHE
 
@@ -1442,7 +1442,7 @@ def CLTVersion():
 try:
 output=GetStdout(['/usr/sbin/pkgutil', '--pkg-info', key])
 returnre.search(regex, output).groupdict()['version']
-except:
+exceptGypError:
 continue
 
 
@@ -1453,6 +1453,8 @@ def GetStdoutQuiet(cmdlist):
 job=subprocess.Popen(cmdlist, stdout=subprocess.PIPE,
 stderr=subprocess.PIPE)
 out=job.communicate()[0]
+ifPY3:
+out=out.decode("utf-8")
 ifjob.returncode!=0:
 raiseGypError('Error %d running %s'% (job.returncode, cmdlist[0]))
 returnout.rstrip('\n')
@@ -1463,6 +1465,8 @@ def GetStdout(cmdlist):
  Raises |GypError| if the command return with a non-zero return code."""
 job=subprocess.Popen(cmdlist, stdout=subprocess.PIPE)
 out=job.communicate()[0]
+ifPY3:
+out=out.decode("utf-8")
 ifjob.returncode!=0:
 sys.stderr.write(out+'\n')
 raiseGypError('Error %d running %s'% (job.returncode, cmdlist[0]))
@@ -1674,7 +1678,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
 install_name_base=xcode_settings.GetInstallNameBase()
 ifinstall_name_base:
 env['DYLIB_INSTALL_NAME_BASE'] =install_name_base
-ifXcodeVersion() >='0500'andnotenv.get('SDKROOT'):
+xcode_version, _=XcodeVersion()
+ifxcode_version>='0500'andnotenv.get('SDKROOT'):
 sdk_root=xcode_settings._SdkRoot(configuration)
 ifnotsdk_root:
 sdk_root=xcode_settings._XcodeSdkPath('')