diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-09-20 15:38:06 +0200 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-10-07 09:39:00 +0200 |
| commit | 9a10caa1e22773ce7563f82680c67596293178e4 (patch) | |
| tree | 43f34f1da86c6d9b5c3535c2652d07af75d4a07c /sources/pyside-tools/android_deploy.py | |
| parent | 9fb2cee3aa525d8b7af065ba875e3a4d1c77e64b (diff) | |
Deployment: Create pyside6-deploy always in main project directory
- There was an issue where if you run pyside6-deploy from a folder
different from the project directory, it creates a new
'pysidedeploy.spec' every time unless you run
'pyside6-deploy -c <config_file>'. This patches fixes this issue by
always creating the pysidedeploy.spec in the main project directory
i.e. the parent directory of the main Python file.
- Additionally, the function 'create_config_file()' can be simplified
since it can never accept an empty 'main_file' argument and the
parameter 'config_file' can be removed.
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: I435f79e7222a55831cddcfbc50e07bc214e24cee
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside-tools/android_deploy.py')
| -rw-r--r-- | sources/pyside-tools/android_deploy.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sources/pyside-tools/android_deploy.py b/sources/pyside-tools/android_deploy.py index abbab4b84..88b310341 100644 --- a/sources/pyside-tools/android_deploy.py +++ b/sources/pyside-tools/android_deploy.py @@ -84,8 +84,7 @@ def main(name: str = None, pyside_wheel: Path = None, shiboken_wheel: Path = Non if config_file_exists: logging.info(f"[DEPLOY] Using existing config file {config_file}") else: - config_file = create_config_file(dry_run=dry_run, config_file=config_file, - main_file=main_file) + config_file = create_config_file(main_file=main_file, dry_run=dry_run) config = AndroidConfig(config_file=config_file, source_file=main_file, python_exe=python.exe, dry_run=dry_run, android_data=android_data, |