diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-01-30 12:09:04 +0100 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-03-01 14:36:12 +0100 |
| commit | 9948f7fd34b268cffaf8cb06d6925f59ce0c538f (patch) | |
| tree | 531f8ceb14ade275523d61816a63dab6fbd357eb /sources/pyside-tools/deploy_lib/android/android_config.py | |
| parent | 019a1932c559f0d73d2d8bcd4b3b26ba03dbccb8 (diff) | |
Deployment: More Refactoring and minor bug fixes
- setup_python() moved to constructor of PythonExecutable.
-install_python_dependencies() moved under PythonExecutable in
python_helper.py.
- create_executable() of PythonExecutable removed. Instead, we call
Nuitka.create_executable() directly. This removes unncessary import
problems when using PythonExecutable class for Android Deployment.
- nuitka==1.8.0 changed to Nuitka=1.8 in default.spec to match with
the installed version. Otherwise, it forces the reinstall of
Nuitka==1.8 every time (bug).
- Remove recomputation of qt_plugins and local_libs. If the values
exist in pysidedeploy.spec, then they should not be computed again.
This serves the purposes of speeding up the deployment and also
to no modifying the already existing pysidedeploy.spec.
- find_pyside_modules() moved from python_helper.py to deploy_util.py.
- Adapt tests.
- Remove os.fspath wrapping from python.exe. This is not needed as
python.exe is already pathlib.Path.
Pick-to: 6.5 6.6
Task-number: PYSIDE-1612
Change-Id: Ic598e57cd2f2779c410b12fc9584cf60c5e94505
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'sources/pyside-tools/deploy_lib/android/android_config.py')
| -rw-r--r-- | sources/pyside-tools/deploy_lib/android/android_config.py | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/sources/pyside-tools/deploy_lib/android/android_config.py b/sources/pyside-tools/deploy_lib/android/android_config.py index 1ea99411f..8054ce373 100644 --- a/sources/pyside-tools/deploy_lib/android/android_config.py +++ b/sources/pyside-tools/deploy_lib/android/android_config.py @@ -121,20 +121,21 @@ class AndroidConfig(Config): self._dependency_files = [] self._find_and_set_dependency_files() - self._qt_plugins = [] - if self.get_value("android", "plugins"): - self._qt_plugins = self.get_value("android", "plugins").split(",") - + dependent_plugins = [] self._local_libs = [] if self.get_value("buildozer", "local_libs"): - self.local_libs = self.get_value("buildozer", "local_libs").split(",") + self._local_libs = self.get_value("buildozer", "local_libs").split(",") + else: + # the local_libs can also store dependent plugins + local_libs, dependent_plugins = self._find_local_libs() + self.local_libs = list(set(local_libs)) - dependent_plugins = [] - # the local_libs can also store dependent plugins - local_libs, dependent_plugins = self._find_local_libs() - self._find_plugin_dependencies(dependent_plugins) - self.qt_plugins += dependent_plugins - self.local_libs += local_libs + self._qt_plugins = [] + if self.get_value("android", "plugins"): + self._qt_plugins = self.get_value("android", "plugins").split(",") + elif dependent_plugins: + self._find_plugin_dependencies(dependent_plugins) + self.qt_plugins = list(set(dependent_plugins)) recipe_dir_temp = self.get_value("buildozer", "recipe_dir") if recipe_dir_temp: @@ -382,11 +383,6 @@ class AndroidConfig(Config): # eg: lib<lib_name>_x86_64.so file_name = Path(file).stem - if file_name.startswith("libplugins_platforms_qtforandroid"): - # the platform library is a requisite and is already added from the - # configuration file - continue - # we only need lib_name, because lib and arch gets re-added by # python-for-android match = lib_pattern.search(file_name) |