diff --git a/build/config/mac/sdk_info.py b/build/config/mac/sdk_info.py index 6396c0fe490274619bba4421d17cb93b23b94c2d..3751ee5a67315a21e0d79ab03ab58b7da3efc10a 100755 --- a/build/config/mac/sdk_info.py +++ b/build/config/mac/sdk_info.py @@ -17,7 +17,7 @@ import sys def SplitVersion(version): - """Splits the Xcode version to 3 values. + """Splits the Xcode version to 3 values. >>> list(SplitVersion('8.2.1.1')) ['8', '2', '1'] @@ -26,14 +26,14 @@ def SplitVersion(version): >>> list(SplitVersion('10.0')) ['10', '0', '0'] """ - if isinstance(version, bytes): - version = version.decode() - version = version.split('.') - return itertools.islice(itertools.chain(version, itertools.repeat('0')), 0, 3) + if isinstance(version, bytes): + version = version.decode() + version = version.split('.') + return itertools.islice(itertools.chain(version, itertools.repeat('0')), 0, 3) def FormatVersion(version): - """Converts Xcode version to a format required for DTXcode in Info.plist + """Converts Xcode version to a format required for DTXcode in Info.plist >>> FormatVersion('8.2.1') '0821' @@ -42,63 +42,63 @@ def FormatVersion(version): >>> FormatVersion('10.0') '1000' """ - major, minor, patch = SplitVersion(version) - return ('%2s%s%s' % (major, minor, patch)).replace(' ', '0') + major, minor, patch = SplitVersion(version) + return ('%2s%s%s' % (major, minor, patch)).replace(' ', '0') def FillXcodeVersion(settings): - """Fills the Xcode version and build number into |settings|.""" - lines = subprocess.check_output(['xcodebuild', '-version']).splitlines() - settings['xcode_version'] = FormatVersion(lines[0].split()[-1]) - settings['xcode_version_int'] = int(settings['xcode_version'], 10) - settings['xcode_build'] = lines[-1].split()[-1] + """Fills the Xcode version and build number into |settings|.""" + lines = subprocess.check_output(['xcodebuild', '-version']).splitlines() + settings['xcode_version'] = FormatVersion(lines[0].split()[-1]) + settings['xcode_version_int'] = int(settings['xcode_version'], 10) + settings['xcode_build'] = lines[-1].split()[-1] def FillMachineOSBuild(settings): - """Fills OS build number into |settings|.""" - settings['machine_os_build'] = subprocess.check_output( + """Fills OS build number into |settings|.""" + settings['machine_os_build'] = subprocess.check_output( ['sw_vers', '-buildVersion']).strip() def FillSDKPathAndVersion(settings, platform, xcode_version): - """Fills the SDK path and version for |platform| into |settings|.""" - settings['sdk_path'] = subprocess.check_output([ + """Fills the SDK path and version for |platform| into |settings|.""" + settings['sdk_path'] = subprocess.check_output([ 'xcrun', '-sdk', platform, '--show-sdk-path']).strip() - settings['sdk_version'] = subprocess.check_output([ + settings['sdk_version'] = subprocess.check_output([ 'xcrun', '-sdk', platform, '--show-sdk-version']).strip() - settings['sdk_platform_path'] = subprocess.check_output([ + settings['sdk_platform_path'] = subprocess.check_output([ 'xcrun', '-sdk', platform, '--show-sdk-platform-path']).strip() - if xcode_version >= '0720': + if xcode_version >= '0720': settings['sdk_build'] = subprocess.check_output([ 'xcrun', '-sdk', platform, '--show-sdk-build-version']).strip() - else: + else: settings['sdk_build'] = settings['sdk_version'] if __name__ == '__main__': - doctest.testmod() + doctest.testmod() - parser = argparse.ArgumentParser() - parser.add_argument("--developer_dir", required=False) - args, unknownargs = parser.parse_known_args() - if args.developer_dir: + parser = argparse.ArgumentParser() + parser.add_argument("--developer_dir", required=False) + args, unknownargs = parser.parse_known_args() + if args.developer_dir: os.environ['DEVELOPER_DIR'] = args.developer_dir - if len(unknownargs) != 1: - sys.stderr.write( + if len(unknownargs) != 1: + sys.stderr.write( 'usage: %s [iphoneos|iphonesimulator|macosx]\n' % os.path.basename(sys.argv[0])) sys.exit(1) - settings = {} - FillMachineOSBuild(settings) - FillXcodeVersion(settings) - FillSDKPathAndVersion(settings, unknownargs[0], settings['xcode_version']) + settings = {} + FillMachineOSBuild(settings) + FillXcodeVersion(settings) + FillSDKPathAndVersion(settings, unknownargs[0], settings['xcode_version']) - for key in sorted(settings): +for key in sorted(settings): value = settings[key] if isinstance(value, bytes): - value = value.decode() + value = value.decode() if key != 'xcode_version_int': value = '"%s"' % value print('%s=%s' % (key, value))