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

Merge branch 'master' into topic-skip-patching-514later

Browse Source
This commit is contained in:
Hiroshi Miura
2021-02-11 18:06:25 +09:00
committed by GitHub
parent a8653a89ea cbb45a8649
commit c0020057fe
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
aqt/updater.py
View File

@@ -44,6 +44,14 @@ class Updater:
file.write_bytes(data) file.write_bytes(data)
os.chmod(str(file), st.st_mode) os.chmod(str(file), st.st_mode)
def _append_string(self, file: pathlib.Path, val: str):
"""Append string to file"""
st = file.stat()
data = file.read_text("UTF-8")
data += val
file.write_text(data, "UTF-8")
os.chmod(str(file), st.st_mode)
def _patch_textfile(self, file: pathlib.Path, old: str, new: str): def _patch_textfile(self, file: pathlib.Path, old: str, new: str):
st = file.stat() st = file.stat()
data = file.read_text("UTF-8") data = file.read_text("UTF-8")
@@ -137,8 +145,25 @@ class Updater:
line = 'QT_LICHECK =\n' line = 'QT_LICHECK =\n'
f.write(line) f.write(line)
def patch_target_qt_conf(self, base_dir, qt_version, arch_dir, os_name):
target_qt_conf = self.prefix / 'bin' / 'target_qt.conf'
if os_name == 'linux':
old_targetprefix = 'Prefix=/home/qt/work/install/target'
new_hostprefix = 'HostPrefix=../../gcc_64'
elif os_name == 'mac':
old_targetprefix = 'Prefix=/Users/qt/work/install/target'
new_hostprefix = 'HostPrefix=../../clang_64'
else:
old_targetprefix = 'Prefix=/Users/qt/work/install/target'
new_hostprefix = 'HostPrefix=../../mingw81_64'
new_targetprefix = 'Prefix={}'.format(str(pathlib.Path(base_dir).joinpath(qt_version, arch_dir, 'target')))
new_hostdata = 'HostData=../{}'.format(arch_dir)
self._patch_textfile(target_qt_conf, old_targetprefix, new_targetprefix)
self._patch_textfile(target_qt_conf, 'HostPrefix=../../', new_hostprefix)
self._patch_textfile(target_qt_conf, 'HostData=target', new_hostdata)
@classmethod @classmethod
def update(cls, target, base_dir, logger): def update(cls, target, base_dir: str, logger):
""" """
Make Qt configuration files, qt.conf and qtconfig.pri. Make Qt configuration files, qt.conf and qtconfig.pri.
And update pkgconfig and patch Qt5Core and qmake And update pkgconfig and patch Qt5Core and qmake
@@ -171,6 +196,7 @@ class Updater:
updater.patch_qmake() updater.patch_qmake()
else: # qt6 non-desktop else: # qt6 non-desktop
updater.patch_qmake_script(base_dir, qt_version, target.os_name) updater.patch_qmake_script(base_dir, qt_version, target.os_name)
updater.patch_target_qt_conf(base_dir, qt_version, arch_dir, target.os_name)
except IOError as e: except IOError as e:
raise e raise e