Skip to content

Commit

Permalink
fix: installation of 6.8 win64_msvc2022_arm64_cross_compiled
Browse files Browse the repository at this point in the history
  • Loading branch information
jdpurcell committed Oct 10, 2024
1 parent 7fbe587 commit 44ee2e8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
4 changes: 3 additions & 1 deletion aqt/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,9 @@ def _get_autodesktop_dir_and_arch(
"""Returns expected_desktop_arch_dir, desktop_arch_to_install"""
is_wasm = arch.startswith("wasm")
is_msvc = "msvc" in arch
is_win_desktop_msvc_arm64 = host == "windows" and target == "desktop" and is_msvc and arch.endswith("arm64")
is_win_desktop_msvc_arm64 = (
host == "windows" and target == "desktop" and is_msvc and arch.endswith(("arm64", "arm64_cross_compiled"))
)
if version < Version("6.0.0") or (
target not in ["ios", "android"] and not is_wasm and not is_win_desktop_msvc_arm64
):
Expand Down
8 changes: 6 additions & 2 deletions aqt/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ def get_arch_dir_name(host: str, arch: str, version: Version) -> str:
m = re.match(r"win\d{2}_(?P<msvc>msvc\d{4})_(?P<winrt>winrt_x\d{2})", arch)
if m:
return f"{m.group('winrt')}_{m.group('msvc')}"
elif arch.endswith("_cross_compiled"):
return arch[6:-15]
else:
return arch[6:]
elif host == "mac" and arch == "clang_64":
Expand All @@ -412,8 +414,10 @@ def default_linux_desktop_arch_dir() -> Tuple[str, str]:

@staticmethod
def default_win_msvc_desktop_arch_dir(_version: Version) -> str:
"""_version is unused, but we expect it to matter for future releases"""
return "msvc2019_64"
if _version >= Version("6.8.0"):
return "msvc2022_64"
else:
return "msvc2019_64"

@staticmethod
def default_mac_desktop_arch_dir(version: Version) -> str:
Expand Down
1 change: 1 addition & 0 deletions aqt/updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ def update(cls, target: TargetConfig, base_path: Path, installed_desktop_arch_di
"android_x86",
"android_armv7",
"win64_msvc2019_arm64",
"win64_msvc2022_arm64_cross_compiled",
]: # desktop version
updater.make_qtconf(base_dir, version_dir, arch_dir)
updater.patch_qmake()
Expand Down

0 comments on commit 44ee2e8

Please sign in to comment.