diff options
| author | j.spijker@ultimaker.com <jelle spijker> | 2022-07-15 14:25:03 +0300 |
|---|---|---|
| committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-07-15 14:25:03 +0300 |
| commit | b7316f450383c9890ad15aadc9c6a77e144d3879 (patch) | |
| tree | 294e43f77e4c8cdc62f754abc35a6eaf7200e033 /packaging | |
| parent | 49161aa4be8f8e19a556315c9674685067c46afe (diff) | |
Use full version in app_name
This should ensure that each Cura version, either release, prerelease or development
Will be installed completely separate from earlier versions
Contributes to CURA-9459
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/NSIS/Ultimaker-Cura.nsi.jinja | 4 | ||||
| -rw-r--r-- | packaging/NSIS/create_windows_installer.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja index 3776f843db..b692597a04 100644 --- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja +++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja @@ -1,10 +1,10 @@ # Copyright (c) 2022 Ultimaker B.V. # Cura's build system is released under the terms of the AGPLv3 or higher. -!define APP_NAME "{{ app_name }} {{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}" +!define APP_NAME "{{ app_name }}" !define COMP_NAME "{{ company }}" !define WEB_SITE "{{ web_site }}" -!define VERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}" +!define VERSION "{{ version }}" !define VIVERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}.0" !define COPYRIGHT "Copyright (c) {{ year }} {{ company }}" !define DESCRIPTION "Application" diff --git a/packaging/NSIS/create_windows_installer.py b/packaging/NSIS/create_windows_installer.py index 519c8f0a7f..d0589ed817 100644 --- a/packaging/NSIS/create_windows_installer.py +++ b/packaging/NSIS/create_windows_installer.py @@ -38,13 +38,14 @@ def generate_nsi(source_path: str, dist_path: str, filename: str): with open(jinja_template_path, "r") as f: template = Template(f.read()) + nsis_content = template.render( - app_name = "Ultimaker Cura", + app_name = f"Ultimaker Cura {os.getenv('CURA_VERSION_FULL')}", main_app = "Ultimaker-Cura.exe", + version = os.getenv('CURA_VERSION_FULL'), version_major = os.environ.get("CURA_VERSION_MAJOR"), version_minor = os.environ.get("CURA_VERSION_MINOR"), version_patch = os.environ.get("CURA_VERSION_PATCH"), - version_build = os.environ.get("CURA_VERSION_BUILD"), company = "Ultimaker B.V.", web_site = "https://ultimaker.com", year = datetime.now().year, |