Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for arch win64_msvc2022_arm64_cross_compiled #832

Merged
merged 1 commit into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading