diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2022-10-28 16:45:30 +0200 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2022-10-31 12:17:46 +0200 |
| commit | e52b2c9ed9bb86042811b36a910f79dd94fbe0cc (patch) | |
| tree | 11e2a3aa9ad065f6fb7c5b1a09992910c8918613 /build_scripts/platforms/linux.py | |
| parent | d40bb5edc0ca96159ac026a65235306c513b3143 (diff) | |
build scripts: use proper variable name instead of self
- Remnants of 6fe563b2aa15c2c23369acce353be69f6ea84c77
Pick-to: 6.4 6.3
Change-Id: I664b960324d49db08f7a8ec6cf5244fbcda970d0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts/platforms/linux.py')
| -rw-r--r-- | build_scripts/platforms/linux.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 4629d456c..ab4acc274 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -11,7 +11,7 @@ from ..utils import (copy_icu_libs, copydir, copyfile, find_files_using_glob, from ..versions import PYSIDE -def prepare_standalone_package_linux(self, _vars, cross_build=False): +def prepare_standalone_package_linux(pyside_build, _vars, cross_build=False): built_modules = _vars['built_modules'] constrain_modules = None @@ -56,19 +56,19 @@ def prepare_standalone_package_linux(self, _vars, cross_build=False): # We choose the QtCore lib to inspect, by # checking which QtCore library the shiboken6 executable uses. if not maybe_icu_libs and not cross_build: - copy_icu_libs(self._patchelf_path, resolved_destination_lib_dir) + copy_icu_libs(pyside_build._patchelf_path, resolved_destination_lib_dir) # Set RPATH for Qt libs. - self.update_rpath_for_linux_qt_libraries(destination_lib_dir.format(**_vars)) + pyside_build.update_rpath_for_linux_qt_libraries(destination_lib_dir.format(**_vars)) # Patching designer to use the Qt libraries provided in the wheel if config.is_internal_pyside_build() and not OPTION['NO_QT_TOOLS']: assistant_path = "{st_build_dir}/{st_package_name}/assistant".format(**_vars) - linux_patch_executable(self._patchelf_path, assistant_path) + linux_patch_executable(pyside_build._patchelf_path, assistant_path) designer_path = "{st_build_dir}/{st_package_name}/designer".format(**_vars) - linux_patch_executable(self._patchelf_path, designer_path) + linux_patch_executable(pyside_build._patchelf_path, designer_path) - if self.is_webengine_built(built_modules): + if pyside_build.is_webengine_built(built_modules): copydir("{qt_data_dir}/resources", "{st_build_dir}/{st_package_name}/Qt/resources", _filter=None, @@ -76,7 +76,7 @@ def prepare_standalone_package_linux(self, _vars, cross_build=False): _vars=_vars) if copy_plugins: - is_pypy = "pypy" in self.build_classifiers + is_pypy = "pypy" in pyside_build.build_classifiers # <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins plugins_target = "{st_build_dir}/{st_package_name}/Qt/plugins" copydir("{qt_plugins_dir}", plugins_target, @@ -90,9 +90,9 @@ def prepare_standalone_package_linux(self, _vars, cross_build=False): recursive=False, _vars=_vars) - copied_plugins = self.get_shared_libraries_in_path_recursively( + copied_plugins = pyside_build.get_shared_libraries_in_path_recursively( plugins_target.format(**_vars)) - self.update_rpath_for_linux_plugins(copied_plugins) + pyside_build.update_rpath_for_linux_plugins(copied_plugins) if copy_qml: # <qt>/qml/* -> <setup>/{st_package_name}/Qt/qml @@ -104,9 +104,9 @@ def prepare_standalone_package_linux(self, _vars, cross_build=False): recursive=True, ignore=["*.debug"], _vars=_vars) - copied_plugins = self.get_shared_libraries_in_path_recursively( + copied_plugins = pyside_build.get_shared_libraries_in_path_recursively( qml_plugins_target.format(**_vars)) - self.update_rpath_for_linux_plugins( + pyside_build.update_rpath_for_linux_plugins( copied_plugins, qt_lib_dir=destination_lib_dir.format(**_vars), is_qml_plugin=True) |