diff --git a/pyproject.toml b/pyproject.toml index add0c4ae..cb76b435 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,6 +58,7 @@ easyDiffraction = 'easyDiffractionApp.main:main' [release] app_name = 'EasyDiffraction' +family_name = 'EasyScience' tag_template = 'v{VERSION}' title_template = 'Version {VERSION} ({DATE})' description_file = 'RELEASE.md' diff --git a/tools/Scripts/Config.py b/tools/Scripts/Config.py index c3b56a52..21409a66 100644 --- a/tools/Scripts/Config.py +++ b/tools/Scripts/Config.py @@ -21,6 +21,7 @@ def __init__(self, branch_name=None): # Application self.app_version = self.__dict__['tool']['poetry']['version'] self.app_name = self.__dict__['release']['app_name'] + self.family_name = self.__dict__['release']['family_name'] self.app_file_ext = self.__dict__['ci']['app']['setup']['file_ext'][self.os] self.app_full_name = f'{self.app_name}{self.app_file_ext}' diff --git a/tools/Scripts/InstallerInstallScript.js b/tools/Scripts/InstallerInstallScript.js index 3a37f815..d49896d0 100644 --- a/tools/Scripts/InstallerInstallScript.js +++ b/tools/Scripts/InstallerInstallScript.js @@ -83,6 +83,15 @@ Component.prototype.createOperations = function() "iconPath=@TargetDir@/@ProductName@/@ProductName@.exe", "iconId=0", "description=@ProductName@" ) + // Add shortcut for maintenance tool. + component.addOperation( + "CreateShortcut", + "@TargetDir@/maintenancetool.exe", + "@StartMenuDir@/@ProductName@/Maintenance Tool.lnk", + "workingDirectory=@TargetDir@", + "iconPath=@TargetDir@/maintenancetool.exe", + "iconId=0", + "description=Update or remove@ProductName@"); // Add start menu shortcut for the app uninstaller /* diff --git a/tools/Scripts/MakeInstaller.py b/tools/Scripts/MakeInstaller.py index e40f7020..7f97308c 100644 --- a/tools/Scripts/MakeInstaller.py +++ b/tools/Scripts/MakeInstaller.py @@ -126,7 +126,7 @@ def installerConfigXml(): 'WizardDefaultWidth': 900, 'WizardDefaultHeight': 600, 'StyleSheet': config_style, - 'StartMenuDir': CONFIG.app_name, + 'StartMenuDir' : CONFIG.family_name, 'TargetDir': CONFIG.installation_dir_for_qtifw, #'CreateLocalRepository': 'true', #'SaveDefaultRepositories': 'false',