wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-21 15:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '14.0' of https://repo.dactyloidae.xyz/Dactyloidae/UXP into 14.0

Browse source
This commit is contained in:
wuggy 2026-09-12 11:59:48 -07:00
commit b5445fd195
26 changed files with 24 additions and 3014 deletions
Download patch file Download diff file Expand all files Collapse all files

17
build/moz.configure/windows.configure
View file

@ -84,7 +84,14 @@ def get_sdk_dirs(sdk, subdir):
include_dirs['winv6.3'] = include_dirs['include']
del include_dirs['include']
valid_versions = sorted(set(include_dirs) & set(lib_dirs), reverse=True)
def build_num(v):
parts = v.split('.')
try:
return int(parts[2]) if len(parts) >= 3 else 0
except ValueError:
return 0
valid_versions = sorted((v for v in set(include_dirs) & set(lib_dirs)
if build_num(v) <= 19041), reverse=True)
if valid_versions:
return namespace(
path=sdk,
@ -136,6 +143,13 @@ def valid_windows_sdk_dir(compiler, windows_sdk_dir, target_version,
'WINDOWSSDKDIR (%s). Please verify it contains a valid and '
'complete SDK installation.' % windows_sdk_dir_env)
def sdk_build(path):
parts = os.path.basename(path).split('.')
try:
return int(parts[2]) if len(parts) >= 3 else 0
except ValueError:
return 0
sdks = {k: v for k, v in sdks.items() if sdk_build(k) <= 19041}
valid_sdks = sorted(sdks, key=lambda x: sdks[x][0], reverse=True)
if valid_sdks:
biggest_version, sdk = sdks[valid_sdks[0]]
@ -226,6 +240,7 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env):
'The SDK in WINDOWSSDKDIR (%s) does not contain the Universal '
'CRT.' % windows_sdk_dir_env)
sdks = {k: v for k, v in sdks.items() if int(str(v[0]).split('.')[2]) <= 19041}
valid_sdks = sorted(sdks, key=lambda x: sdks[x][0], reverse=True)
if not valid_sdks:
raise FatalCheckError('Cannot find the Universal CRT SDK. '