From aefc27d707d32de1e13fbb873b14c34886a97977 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Fri, 28 Jun 2024 16:53:52 +0100 Subject: [PATCH] JAL-3631 Group USERSPACE and SYSTEMSPACE tasks (and other groups of tasks) together for neatness --- utils/install4j/install4j10_template.install4j | 731 +++++++++++++----------- 1 file changed, 413 insertions(+), 318 deletions(-) diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j index 8d9e5b5..d1ca52e 100644 --- a/utils/install4j/install4j10_template.install4j +++ b/utils/install4j/install4j10_template.install4j @@ -185,7 +185,7 @@ - + @@ -534,41 +534,117 @@ return console.askOkCancel(message, true); - + - + - ${i18n:SelectComponentsLabel2} + ${i18n:SelectAssociationsLabel} - !context.isConsole() - + + + - selectionChangedScript + showSelectionButtons + selectionButtonPosition - + + + User account + ${i18n:WizardSelectTasks} + + !Util.hasFullAdminRights() - + - ${i18n:SelectAssociationsLabel} + ${i18n:SelectTasksLabel2(${compiler:JALVIEW_APPLICATION_NAME})} - + - - - + ${i18n:CreateDesktopIcon} + createDesktopLinkAction - - showSelectionButtons - selectionButtonPosition - + !Util.isMacOS() + + + + ${i18n:AddToDock} + addToDockAction + + Util.isMacOS() + + + + Add ${compiler:JALVIEW_APPLICATION_NAME}'s bin folder to your Path environment variable + + appendToPathAction + + Util.isWindows() + + + + Make a ${compiler:WRAPPER_LINK} symbolic link in ${installer:unixBinDir} + + makeSymbolicLinkAction + + context.getBooleanVariable("makeSymbolicLink") +&& context.getVariable("unixBinDir") != null +&& ( + Util.isLinux() + || Util.isUnixInstaller() + || ( + ( Util.isMacOS() && !Util.hasFullAdminRights() ) // Admin on macOS will add path to /etc/paths.d + && context.getVariable("macWrapperLinkLocation") != null + ) + ) + + + + + + + System + ${i18n:WizardSelectTasks} + + Util.hasFullAdminRights() + + + + ${i18n:SelectTasksLabel2(${compiler:JALVIEW_APPLICATION_NAME})} + + + + + Add ${compiler:JALVIEW_APPLICATION_NAME}'s bin folder to the system Path environment variable + + appendToPathAction + + Util.isWindows() + + + + Make a ${compiler:WRAPPER_LINK} symbolic link in ${installer:unixBinDir} + + makeSymbolicLinkAction + + context.getBooleanVariable("makeSymbolicLink") +&& context.getVariable("unixBinDir") != null +&& ( + Util.isLinux() + || Util.isUnixInstaller() + || ( + ( Util.isMacOS() && !Util.hasFullAdminRights() ) // Admin on macOS will add path to /etc/paths.d + && context.getVariable("macWrapperLinkLocation") != null + ) + ) + @@ -610,23 +686,6 @@ return console.askOkCancel(message, true); ${compiler:sys.fullName} ${compiler:sys.version} - - - - - - - - - - true - - - - 121 - - - @@ -666,302 +725,342 @@ return console.askOkCancel(message, true); - - - 2823 - jalview - - - - - 2823 - jalviews - - - - - 2823 - jalviewhttp - - - - - 2823 - jalviewhttps - - - - - 2823 - ${compiler:EXTRA_SCHEME} - - - - - - - ${i18n:WizardPreparing} - - - - - - - - - - - ${compiler:JRE_DIR}/bin/java - - - - - ${compiler:JRE_DIR}/bin/${compiler:JALVIEW_NAME} - - - - - Util.isLinux() || Util.isMacOS() - - - - - - ${compiler:JRE_DIR}/bin/java - - - - - ${compiler:JRE_DIR}/bin/${compiler:JALVIEW_APPLICATION_NAME} - - - - - (Util.isLinux() || Util.isMacOS()) -&& !((String)context.getCompilerVariable("JALVIEW_APPLICATION_NAME")).equals((String)context.getCompilerVariable("JALVIEW_NAME")) - - - - - ${compiler:APPLICATION_CATEGORIES} - ${compiler:JALVIEW_APPLICATION_NAME} - - - ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} - - - - - ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} - - - ${compiler:JALVIEW_NAME} - - - ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} - - - - !Util.hasFullAdminRights() && !context.getBooleanVariable("sys.programGroupDisabled") - - - - - ${compiler:JALVIEW_APPLICATION_NAME} - - - ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} - - - ${compiler:JALVIEW_APPLICATION_NAME} - - - ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} - - - - - ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} - - - - !Util.hasFullAdminRights() && context.getBooleanVariable("createDesktopLinkAction") - - + + + + + 2823 + jalview + + + + + 2823 + jalviews + + + + + 2823 + jalviewhttp + + + + + 2823 + jalviewhttps + + + + + 2823 + ${compiler:EXTRA_SCHEME} + + + + + - - - ${compiler:JALVIEW_APPLICATION_NAME}.app + + + !Util.hasFullAdminRights() - !Util.hasFullAdminRights() + + + + + ${compiler:APPLICATION_CATEGORIES} + ${compiler:JALVIEW_APPLICATION_NAME} + + + ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} + + + + + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} + + + ${compiler:JALVIEW_NAME} + + + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} + + + + !Util.hasFullAdminRights() && !context.getBooleanVariable("sys.programGroupDisabled") + + + + + ${compiler:JALVIEW_APPLICATION_NAME} + + + ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} + + + ${compiler:JALVIEW_APPLICATION_NAME} + + + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} + + + + + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} + + + + !Util.hasFullAdminRights() && context.getBooleanVariable("createDesktopLinkAction") + + + + + + ${compiler:JALVIEW_APPLICATION_NAME}.app + + + + !Util.hasFullAdminRights() && context.getBooleanVariable("addToDockAction") - - - - - ${installer:sys.contentDir}\${compiler:WRAPPER_SCRIPT_BIN_DIR} - Path - - !Util.hasFullAdminRights() && context.getBooleanVariable("appendToPathAction") - - - - - - ${installer:macWrapperLinkLocation} - - - - - ${installer:unixBinDir}/${compiler:WRAPPER_LINK} - - - - Util.isMacOS() && !Util.hasFullAdminRights() // Admin on macOS will add path to /etc/paths.d + + + + + ${installer:sys.contentDir}\${compiler:WRAPPER_SCRIPT_BIN_DIR} + Path + + !Util.hasFullAdminRights() && context.getBooleanVariable("appendToPathAction") + + + + + + ${installer:macWrapperLinkLocation} + + + + + ${installer:unixBinDir}/${compiler:WRAPPER_LINK} + + + + Util.isMacOS() && !Util.hasFullAdminRights() // Admin on macOS will add path to /etc/paths.d && ( context.getBooleanVariable("makeSymbolicLinkAction") && context.getVariable("unixBinDir") != null && context.getVariable("macWrapperLinkLocation") != null ) - - - - - - ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT} - - - - - ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK} - - - - Util.isLinux() || Util.isUnixInstaller() || Util.isMacOS() - - - - - - ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK}.bat - - - - - - ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BATCH_WRAPPER_SCRIPT} - - - - - Util.isWindows() && !(((String)context.getCompilerVariable("WRAPPER_LINK")+".bat").equals((String)context.getCompilerVariable("BATCH_WRAPPER_SCRIPT"))) - - - - - - ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK}.ps1 - - - - - - ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:POWERSHELL_WRAPPER_SCRIPT} - - - - - Util.isWindows() && !(((String)context.getCompilerVariable("WRAPPER_LINK")+".ps1").equals((String)context.getCompilerVariable("POWERSHELL_WRAPPER_SCRIPT"))) - - - - ${compiler:APPLICATION_CATEGORIES} - ${compiler:JALVIEW_APPLICATION_NAME} - - - ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} - - - - - ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} - - - ${compiler:JALVIEW_NAME} - - - - ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} - - - - Util.hasFullAdminRights() && !context.getBooleanVariable("sys.programGroupDisabled") - - - - ${compiler:JALVIEW_APPLICATION_NAME} - - - ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} - - - ${compiler:JALVIEW_APPLICATION_NAME} - - - - ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} - - - - - ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} - - - - Util.hasFullAdminRights() && context.getBooleanVariable("createDesktopLinkAction") - - - - - - ${installer:sys.contentDir}\${compiler:WRAPPER_SCRIPT_BIN_DIR} - Path - - Util.hasFullAdminRights() && context.getBooleanVariable("appendToPathAction") - - + + + + - - - /etc/paths.d/${compiler:APPLICATION_FOLDER} + + + Util.hasFullAdminRights() - /Applications/${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/MacOS - Util.hasFullAdminRights() && Util.isMacOS() - - + + + + ${compiler:APPLICATION_CATEGORIES} + ${compiler:JALVIEW_APPLICATION_NAME} + + + ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} + + + + + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} + + + ${compiler:JALVIEW_NAME} + + + + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} + + + + !context.getBooleanVariable("sys.programGroupDisabled") + + + + ${compiler:JALVIEW_APPLICATION_NAME} + + + ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} + + + ${compiler:JALVIEW_APPLICATION_NAME} + + + + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} + + + + + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} + + + + context.getBooleanVariable("createDesktopLinkAction") + + + + + + ${installer:sys.contentDir}\${compiler:WRAPPER_SCRIPT_BIN_DIR} + Path + + context.getBooleanVariable("appendToPathAction") + + + + + + /etc/paths.d/${compiler:APPLICATION_FOLDER} + + + /Applications/${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/MacOS + + Util.isMacOS() + + + + + + + + + + ${installer:sys.contentDir}/${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT} + + + + + ${installer:unixBinDir}/${compiler:WRAPPER_LINK} + + + + context.getBooleanVariable("makeSymbolicLink") +&& context.getBooleanVariable("makeSymbolicLinkAction") +&& context.getVariable("unixBinDir") != null + + + + + + + + + + ${compiler:JRE_DIR}/bin/java + + + + + ${compiler:JRE_DIR}/bin/${compiler:JALVIEW_NAME} + + + + + Util.isLinux() || Util.isMacOS() + + + + + + ${compiler:JRE_DIR}/bin/java + + + + + ${compiler:JRE_DIR}/bin/${compiler:JALVIEW_APPLICATION_NAME} + + + + + (Util.isLinux() || Util.isMacOS()) +&& !((String)context.getCompilerVariable("JALVIEW_APPLICATION_NAME")).equals((String)context.getCompilerVariable("JALVIEW_NAME")) + + + + + + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT} + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK} + + + + Util.isLinux() || Util.isUnixInstaller() || Util.isMacOS() + + + + + + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK}.bat + + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BATCH_WRAPPER_SCRIPT} + + + + + Util.isWindows() && !(((String)context.getCompilerVariable("WRAPPER_LINK")+".bat").equals((String)context.getCompilerVariable("BATCH_WRAPPER_SCRIPT"))) + + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK}.ps1 + + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:POWERSHELL_WRAPPER_SCRIPT} + + + + + Util.isWindows() && !(((String)context.getCompilerVariable("WRAPPER_LINK")+".ps1").equals((String)context.getCompilerVariable("POWERSHELL_WRAPPER_SCRIPT"))) + + + + + + - - - ${installer:sys.contentDir}/${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT} - - - - - ${installer:unixBinDir}/${compiler:WRAPPER_LINK} - - + ${i18n:WizardPreparing} - context.getBooleanVariable("makeSymbolicLinkAction") -&& context.getVariable("unixBinDir") != null -&& context.getBooleanVariable("makeSymbolicLink") - - + + + + @@ -1023,7 +1122,7 @@ context.getBooleanVariable("addToDockAction") - + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} @@ -1387,10 +1486,6 @@ return console.askYesNo(message, true); Running ${i18n:SetupAppTitle} - - - - -- 1.7.10.2