Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2022-06-06 08:58:26 +08:00
commit 79792a91ee
11 changed files with 255 additions and 41 deletions

View file

@ -52,7 +52,7 @@ def main():
sdk_dir = xcode43_sdk_path
else:
sdk_dir = os.path.join(out.rstrip(), 'SDKs')
sdks = [re.findall('^MacOSX(10\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)]
sdks = [re.findall('^MacOSX(\d+\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)]
sdks = [s[0] for s in sdks if s] # [['10.5'], ['10.6']] => ['10.5', '10.6']
sdks = [s for s in sdks # ['10.5', '10.6'] => ['10.6']
if parse_version(s) >= parse_version(min_sdk_version)]

View file

@ -19,11 +19,12 @@ if sys.platform == 'darwin':
print("find_sdk_uxp.py: error: Specified path does not exist or is not a directory")
sys.exit(1)
KNOWN_SDK_VERSIONS = ["10.7", "10.8", "10.9", "10.10",
"10.11", "10.12", "10.13", "10.14",
"10.15"]
KNOWN_SDK_VERSIONS = ["10.7", "10.8", "10.9", "10.10", "10.11"
"10.12", "10.13", "10.14", "10.15", "10.16",
"11.0", "11.1", "11.2", "11.3",
"12.0"]
REGEX = "^MacOSX(10\.\d+)\.sdk$"
REGEX = "^MacOSX(\d+\.\d+)\.sdk$"
SDK_VERSION = re.findall(REGEX, os.path.basename(SDK_PATH))
if not SDK_VERSION: