Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-17 20:54:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: support list Qt 6.8.0 windows_arm64

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2024-06-20 21:15:13 +09:00
parent 6f2f085fdb
commit b8f7ed69c1
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aqt/archives.py
View File

@@ -380,12 +380,12 @@ class QtArchives:
os_name = self.os_name os_name = self.os_name
if self.os_name == "windows": if self.os_name == "windows":
os_name += "_x86" os_name += "_x86"
elif os_name != "linux_arm64" and os_name != "all_os": elif os_name != "linux_arm64" and os_name != "all_os" and os_name != "windows_arm64":
os_name += "_x64" os_name += "_x64"
if self.target == "android" and self.version >= Version("6.7.0"): if self.target == "android" and self.version >= Version("6.7.0"):
os_name = "all_os" os_name = "all_os"
# #
if os_name == "windows_x86" and self.version >= Version("6.8.0"): if os_name in ("windows_x86", "windows_arm64") and self.version >= Version("6.8.0"):
os_target_folder = posixpath.join( os_target_folder = posixpath.join(
"online/qtsdkrepository", "online/qtsdkrepository",
os_name, os_name,

12
aqt/installer.py
View File

@@ -280,6 +280,8 @@ class Cli:
return "android" return "android"
except ValueError: except ValueError:
pass pass
elif os_name == "windows_arm64" and target == "desktop":
return "windows_msvc2022_arm64"
raise CliInputError("Please supply a target architecture.", should_show_help=True) raise CliInputError("Please supply a target architecture.", should_show_help=True)
def _check_mirror(self, mirror): def _check_mirror(self, mirror):
@@ -747,7 +749,7 @@ class Cli:
def _set_install_tool_parser(self, install_tool_parser, *, is_legacy: bool): def _set_install_tool_parser(self, install_tool_parser, *, is_legacy: bool):
install_tool_parser.set_defaults(func=self.run_install_tool, is_legacy=is_legacy) install_tool_parser.set_defaults(func=self.run_install_tool, is_legacy=is_legacy)
install_tool_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name") install_tool_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
if not is_legacy: if not is_legacy:
install_tool_parser.add_argument( install_tool_parser.add_argument(
"target", "target",
@@ -804,7 +806,7 @@ class Cli:
def make_parser_list_sde(cmd: str, desc: str, cmd_type: str): def make_parser_list_sde(cmd: str, desc: str, cmd_type: str):
parser = subparsers.add_parser(cmd, description=desc) parser = subparsers.add_parser(cmd, description=desc)
parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name") parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
parser.add_argument( parser.add_argument(
"qt_version_spec", "qt_version_spec",
metavar="(VERSION | SPECIFICATION)", metavar="(VERSION | SPECIFICATION)",
@@ -852,7 +854,7 @@ class Cli:
"$ aqt list-qt mac desktop --archives 5.9.0 clang_64 # list archives in base Qt installation\n" "$ aqt list-qt mac desktop --archives 5.9.0 clang_64 # list archives in base Qt installation\n"
"$ aqt list-qt mac desktop --archives 5.14.0 clang_64 debug_info # list archives in debug_info module\n", "$ aqt list-qt mac desktop --archives 5.14.0 clang_64 debug_info # list archives in debug_info module\n",
) )
list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name") list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
list_parser.add_argument( list_parser.add_argument(
"target", "target",
nargs="?", nargs="?",
@@ -936,7 +938,7 @@ class Cli:
"$ aqt list-tool mac desktop tools_ifw --long # print tool variant names with metadata for QtIFW\n" "$ aqt list-tool mac desktop tools_ifw --long # print tool variant names with metadata for QtIFW\n"
"$ aqt list-tool mac desktop ifw --long # print tool variant names with metadata for QtIFW\n", "$ aqt list-tool mac desktop ifw --long # print tool variant names with metadata for QtIFW\n",
) )
list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name") list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
list_parser.add_argument( list_parser.add_argument(
"target", "target",
nargs="?", nargs="?",
@@ -1023,7 +1025,7 @@ class Cli:
""" """
if is_legacy: if is_legacy:
subparser.add_argument("qt_version", help='Qt version in the format of "5.X.Y"') subparser.add_argument("qt_version", help='Qt version in the format of "5.X.Y"')
subparser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name") subparser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
if is_target_deprecated: if is_target_deprecated:
subparser.add_argument( subparser.add_argument(
"target", "target",

10
aqt/metadata.py
View File

@@ -199,9 +199,10 @@ def get_semantic_version(qt_ver: str, is_preview: bool) -> Optional[Version]:
class ArchiveId: class ArchiveId:
CATEGORIES = ("tools", "qt") CATEGORIES = ("tools", "qt")
HOSTS = ("windows", "mac", "linux", "linux_arm64", "all_os") HOSTS = ("windows", "windows_arm64", "mac", "linux", "linux_arm64", "all_os")
TARGETS_FOR_HOST = { TARGETS_FOR_HOST = {
"windows": ["android", "desktop", "winrt"], "windows": ["android", "desktop", "winrt"],
"windows_arm64": ["desktop"],
"mac": ["android", "desktop", "ios"], "mac": ["android", "desktop", "ios"],
"linux": ["android", "desktop"], "linux": ["android", "desktop"],
"linux_arm64": ["desktop"], "linux_arm64": ["desktop"],
@@ -233,7 +234,7 @@ class ArchiveId:
def to_url(self) -> str: def to_url(self) -> str:
return "online/qtsdkrepository/{os}{arch}/{target}/".format( return "online/qtsdkrepository/{os}{arch}/{target}/".format(
os=self.host, os=self.host,
arch=("_x86" if self.host == "windows" else ("" if self.host in ("linux_arm64", "all_os") else "_x64")), arch=("_x86" if self.host == "windows" else ("" if self.host in ("linux_arm64", "all_os", "windows_arm64") else "_x64")),
target=self.target, target=self.target,
) )
@@ -957,7 +958,10 @@ class MetadataFactory:
elif self.archive_id.host == "mac": elif self.archive_id.host == "mac":
return "clang_64" return "clang_64"
elif self.archive_id.host == "windows" and is_msvc: elif self.archive_id.host == "windows" and is_msvc:
return "win64_msvc2019_64" if version >= Version("6.8.0"):
return "win64_msvc2022_64"
else:
return "win64_msvc2019_64"
arches = [arch for arch in self.fetch_arches(version) if QtRepoProperty.MINGW_ARCH_PATTERN.match(arch)] arches = [arch for arch in self.fetch_arches(version) if QtRepoProperty.MINGW_ARCH_PATTERN.match(arch)]
selected_arch = QtRepoProperty.select_default_mingw(arches, is_dir=False) selected_arch = QtRepoProperty.select_default_mingw(arches, is_dir=False)
if not selected_arch: if not selected_arch: