Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 13:14:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix regression "check packaging"

Browse Source
This commit is contained in:
tsteven4
2024-11-28 11:43:16 -07:00
parent ee40b25e84
commit a1ffb938a8
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
aqt/archives.py
View File

@@ -31,11 +31,13 @@ from aqt.exceptions import ArchiveDownloadError, ArchiveListError, ChecksumDownl
from aqt.helper import Settings, get_hash, getUrl, ssplit from aqt.helper import Settings, get_hash, getUrl, ssplit
from aqt.metadata import QtRepoProperty, Version from aqt.metadata import QtRepoProperty, Version
@dataclass @dataclass
class UpdateXmls: class UpdateXmls:
target_folder: str target_folder: str
xml_text: str xml_text: str
@dataclass @dataclass
class TargetConfig: class TargetConfig:
version: str version: str
@@ -409,19 +411,14 @@ class QtArchives:
if self.version >= Version("6.8.0"): if self.version >= Version("6.8.0"):
arch = self.arch arch = self.arch
if self.os_name == "windows": if self.os_name == "windows":
arch = self.arch.replace("win64_", "", 1) arch = self.arch.replace("win64_", "", 1)
elif self.os_name == "linux": elif self.os_name == "linux":
arch = "x86_64" arch = "x86_64"
elif self.os_name == "linux_arm64": elif self.os_name == "linux_arm64":
arch = "arm64" arch = "arm64"
for ext in ["qtwebengine", "qtpdf"]: for ext in ["qtwebengine", "qtpdf"]:
extensions_target_folder = posixpath.join( extensions_target_folder = posixpath.join(
"online/qtsdkrepository", "online/qtsdkrepository", os_name, "extensions", ext, self._version_str(), arch
os_name,
"extensions",
ext,
self._version_str(),
arch
) )
extensions_xml_url = posixpath.join(extensions_target_folder, "Updates.xml") extensions_xml_url = posixpath.join(extensions_target_folder, "Updates.xml")
extensions_xml_text = self._download_update_xml(extensions_xml_url) extensions_xml_text = self._download_update_xml(extensions_xml_url)

11
aqt/metadata.py
View File

@@ -244,7 +244,7 @@ class ArchiveId:
def to_extension_folder(self, module, version, arch) -> str: def to_extension_folder(self, module, version, arch) -> str:
extarch = arch extarch = arch
if self.host == "windows": if self.host == "windows":
extarch = arch.replace("win64_", "", 1) extarch = arch.replace("win64_", "", 1)
elif self.host == "linux": elif self.host == "linux":
extarch = "x86_64" extarch = "x86_64"
elif self.host == "linux_arm64": elif self.host == "linux_arm64":
@@ -929,14 +929,7 @@ class MetadataFactory:
# Examples: extensions.qtwebengine.680.debug_information # Examples: extensions.qtwebengine.680.debug_information
# extensions.qtwebengine.680.win64_msvc2022_64 # extensions.qtwebengine.680.win64_msvc2022_64
ext_pattern = re.compile( ext_pattern = re.compile(r"^extensions\." + r"(?P<module>[^.]+)\." + qt_ver_str + r"\." + arch + r"$")
r"^extensions\."
+ r"(?P<module>[^.]+)\."
+ qt_ver_str
+ r"\."
+ arch
+ r"$"
)
if version >= Version("6.8.0"): if version >= Version("6.8.0"):
for ext in self.fetch_extensions(): for ext in self.fetch_extensions():
ext_meta = self._fetch_extension_metadata(self.archive_id.to_extension_folder(ext, qt_ver_str, arch)) ext_meta = self._fetch_extension_metadata(self.archive_id.to_extension_folder(ext, qt_ver_str, arch))