From 97d203685e0ce19e932cfce43e6511ed9cf6ca8a Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 8 Nov 2023 19:23:32 +0100 Subject: [PATCH] Restore operating system name in final executables --- builder/pyinstaller_build_macos.py | 2 +- builder/pyinstaller_build_ubuntu.py | 2 +- builder/pyinstaller_build_windows.py | 2 +- docs/development/packaging.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/pyinstaller_build_macos.py b/builder/pyinstaller_build_macos.py index e7749bdc..b2b6fc06 100644 --- a/builder/pyinstaller_build_macos.py +++ b/builder/pyinstaller_build_macos.py @@ -39,7 +39,7 @@ # variables output_filename = ( - f"{__about__.__title_clean__}_{__about__.__version__.replace('.', '-')}" + f"MacOS_{__about__.__title_clean__}_{__about__.__version__.replace('.', '-')}" ) package_folder = Path("qgis_deployment_toolbelt") diff --git a/builder/pyinstaller_build_ubuntu.py b/builder/pyinstaller_build_ubuntu.py index 62266949..aa206980 100644 --- a/builder/pyinstaller_build_ubuntu.py +++ b/builder/pyinstaller_build_ubuntu.py @@ -42,7 +42,7 @@ # variables output_filename = ( - f"{__about__.__title_clean__}_{__about__.__version__.replace('.', '-')}" + f"Ubuntu_{__about__.__title_clean__}_{__about__.__version__.replace('.', '-')}" ) package_folder = Path("qgis_deployment_toolbelt") diff --git a/builder/pyinstaller_build_windows.py b/builder/pyinstaller_build_windows.py index 3482832d..4655e7a4 100644 --- a/builder/pyinstaller_build_windows.py +++ b/builder/pyinstaller_build_windows.py @@ -40,7 +40,7 @@ # variables output_filename = ( - f"{__about__.__title_clean__}_{__about__.__version__.replace('.', '-')}" + f"Windows_{__about__.__title_clean__}_{__about__.__version__.replace('.', '-')}" ) package_folder = Path("qgis_deployment_toolbelt") diff --git a/docs/development/packaging.md b/docs/development/packaging.md index 372e2f77..6e09c614 100644 --- a/docs/development/packaging.md +++ b/docs/development/packaging.md @@ -4,7 +4,7 @@ The project takes advantage of [PyInstaller](https://pyinstaller.readthedocs.io/) to package the application into an executable. -The output binary and all embedded dependencies is located into a subfolder named: `dist/QGISDeploymentToolbelt_{version}`. A file named `build_environment_report.txt` containing build environment information is generated at the project's root. +The output binary and all embedded dependencies is located into a subfolder named `dist`: `dist/{operating_system}_QGISDeploymentToolbelt_{version}`, where operating system is one of `MacOS`, `Ubuntu`or `Windows`. A file named `build_environment_report.txt` containing build environment information is generated at the project's root. ### Windows