GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 04:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the InstallDirRegKey

Browse Source 
This should ensure that the default directory will always falls back to
`"$PROGRAMFILES64\${APP_NAME}"` where `APP_NAME` is:
`{{ app_name }} {{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}`

Contributes to CURA-9459
This commit is contained in:
j.spijker@ultimaker.com 2022-07-15 13:07:21 +02:00 committed by Jelle Spijker
parent f1a6c54414
commit 82c6035754
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/NSIS/Ultimaker-Cura.nsi.jinja
View File

@ -1,10 +1,11 @@
# 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 }}"
!define APP_NAME "{{ app_name }} {{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}"
!define COMP_NAME "{{ company }}"
!define WEB_SITE "{{ web_site }}"
!define VERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}"
!define VIVERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}.0"
!define COPYRIGHT "Copyright (c) {{ year }} {{ company }}"
!define DESCRIPTION "Application"
!define LICENSE_TXT "{{ cura_license_file }}"
@ -24,12 +25,12 @@ var SM_Folder
######################################################################
VIProductVersion "${VERSION}"
VIProductVersion "${VIVERSION}"
VIAddVersionKey "ProductName" "{{ app_name }}"
VIAddVersionKey "CompanyName" "${COMP_NAME}"
VIAddVersionKey "LegalCopyright" "${COPYRIGHT}"
VIAddVersionKey "FileDescription" "${DESCRIPTION}"
VIAddVersionKey "FileVersion" "${VERSION}"
VIAddVersionKey "FileVersion" "${VIVERSION}"
######################################################################
@ -38,7 +39,6 @@ Name "${APP_NAME}"
Caption "${APP_NAME}"
OutFile "${INSTALLER_NAME}"
BrandingText "${APP_NAME}"
InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
InstallDir "$PROGRAMFILES64\${APP_NAME}"
######################################################################

1
packaging/NSIS/create_windows_installer.py
View File

@ -5,7 +5,6 @@ import argparse # Command line arguments parsing and help.
import subprocess
import shutil
import sys
from datetime import datetime
from pathlib import Path