diff options
| -rw-r--r-- | build_scripts/platforms/unix.py | 1 | ||||
| -rw-r--r-- | sources/pyside-tools/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sources/pyside-tools/pyside_tool.py | 12 | ||||
| -rw-r--r-- | sources/pyside-tools/requirements-android.txt | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 8f8e496be..17c4ba34f 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -126,6 +126,7 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): if sys.platform.startswith("linux"): scripts.append("android_deploy.py") + scripts.append("requirements-android.txt") script_dirs.extend(["deploy_lib/android", "deploy_lib/android/recipes/PySide6", "deploy_lib/android/recipes/shiboken6",]) diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt index 795ff669b..d8a353300 100644 --- a/sources/pyside-tools/CMakeLists.txt +++ b/sources/pyside-tools/CMakeLists.txt @@ -25,7 +25,8 @@ else() ${CMAKE_CURRENT_SOURCE_DIR}/qml.py ${CMAKE_CURRENT_SOURCE_DIR}/qtpy2cpp.py ${CMAKE_CURRENT_SOURCE_DIR}/deploy.py - ${CMAKE_CURRENT_SOURCE_DIR}/android_deploy.py) + ${CMAKE_CURRENT_SOURCE_DIR}/android_deploy.py + ${CMAKE_CURRENT_SOURCE_DIR}/requirements-android.txt) set(directories ${CMAKE_CURRENT_SOURCE_DIR}/deploy_lib ${CMAKE_CURRENT_SOURCE_DIR}/project) diff --git a/sources/pyside-tools/pyside_tool.py b/sources/pyside-tools/pyside_tool.py index 1648b2943..280c9ec3b 100644 --- a/sources/pyside-tools/pyside_tool.py +++ b/sources/pyside-tools/pyside_tool.py @@ -197,11 +197,13 @@ def android_deploy(): if not sys.platform == "linux": print("pyside6-android-deploy only works from a Linux host") else: - dependent_packages = ["jinja2", "pkginfo"] - for dependent_package in dependent_packages: - if not bool(importlib.util.find_spec(dependent_package)): - command = [sys.executable, "-m", "pip", "install", dependent_package] - subprocess.run(command) + android_requirements_file = Path(__file__).parent / "requirements-android.txt" + with open(android_requirements_file, 'r', encoding='UTF-8') as file: + while line := file.readline(): + dependent_package = line.rstrip() + if not bool(importlib.util.find_spec(dependent_package)): + command = [sys.executable, "-m", "pip", "install", dependent_package] + subprocess.run(command) pyside_script_wrapper("android_deploy.py") diff --git a/sources/pyside-tools/requirements-android.txt b/sources/pyside-tools/requirements-android.txt new file mode 100644 index 000000000..1169fd663 --- /dev/null +++ b/sources/pyside-tools/requirements-android.txt @@ -0,0 +1,2 @@ +jinja2 +pkginfo |