3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Use full version in app_name

Browse source 
This should ensure that each Cura version, either release, prerelease or development
Will be installed completely separate from earlier versions

Contributes to CURA-9459
This commit is contained in:
j.spijker@ultimaker.com 2022-07-15 13:25:03 +02:00 • committed by Jelle Spijker
parent 49161aa4be
commit b7316f4503
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packaging/NSIS/Ultimaker-Cura.nsi.jinja
View file

@ -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"

5
packaging/NSIS/create_windows_installer.py
View file

@ -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,