X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Finstall4j%2Finstall4j9_template.install4j;h=a6d0893f225445887c9b88530c7e125c4cc3e989;hb=eca4795050a0f7eca3d5dece68eaa54987cebd15;hp=7b8d00028619de18d6557602a150d04abd68a927;hpb=27d1f0e6032bb93b39aeaad7a0b6566dd53d75e4;p=jalview.git diff --git a/utils/install4j/install4j9_template.install4j b/utils/install4j/install4j9_template.install4j index 7b8d000..a6d0893 100644 --- a/utils/install4j/install4j9_template.install4j +++ b/utils/install4j/install4j9_template.install4j @@ -1,7 +1,7 @@ - + - + @@ -23,12 +23,12 @@ - - - - - - + + + + + + @@ -145,7 +145,7 @@ - + @@ -160,6 +160,10 @@ + + + + 2350 @@ -557,12 +561,17 @@ return console.askOkCancel(message, true); - - - This action, identified by its name "EXTENSIONS_REPLACED_BY_GRADLE", will be replaced by gradle with the contents of file 'file_associations_auto_install4j.xml'. - extensions_to_be_replaced_by_gradle - - + + + + + This action, identified by its name "EXTENSIONS_REPLACED_BY_GRADLE", will be replaced by gradle with the contents of file 'file_associations_auto_install4j.xml'. + extensions_to_be_replaced_by_gradle + JALVIEW + + + + Finished creating file associations @@ -579,19 +588,19 @@ return console.askOkCancel(message, true); - 737 + JALVIEW jalview - 737 + JALVIEW jalviews - 737 + JALVIEW ${compiler:EXTRA_SCHEME} @@ -699,7 +708,7 @@ return console.askOkCancel(message, true); - context.getBooleanVariable("makeSymbolicLink") && ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null ) + context.getBooleanVariable("makeSymbolicLinkAction") && ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null ) @@ -714,7 +723,7 @@ return console.askOkCancel(message, true); - context.getBooleanVariable("makeSymbolicLink") && ( Util.isMacOS() ) && ( context.getVariable("unixUserBinDir") != null ) && ( context.getVariable("macWrapperLinkLocation") != null ) + context.getBooleanVariable("makeSymbolicLinkAction") && Util.isMacOS() && ( context.getVariable("unixUserBinDir") != null ) && ( context.getVariable("macWrapperLinkLocation") != null ) @@ -729,6 +738,7 @@ return console.askOkCancel(message, true); createDesktopLinkAction + !Util.isMacOS() @@ -748,11 +758,11 @@ return console.askOkCancel(message, true); - Make a ${compiler:WRAPPER_LINK} symbolic link in ~/${installer:unixUserBinDir} + Make a ${compiler:WRAPPER_LINK} symbolic link in ${installer:unixUserBinDir} - makeSymbolicLink + makeSymbolicLinkAction - ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null ) + ( Util.isLinux() || Util.isUnixInstaller() || ( Util.isMacOS() && ( context.getVariable("macWrapperLinkLocation") != null ) ) ) && ( context.getVariable("unixUserBinDir") != null ) @@ -1095,6 +1105,68 @@ return console.askYesNo(message, true); + + + + + . + + + ${compiler:WRAPPER_LINK}_setup + ${compiler:sys.fullName} + + + + + + + + + + + + + + Running ${i18n:SetupAppTitle} + + + + + + + + + ${i18n:FinishedLabel(${compiler:JALVIEW_APPLICATION_NAME})} + + + + + ${i18n:AddToDock} + + addToDockAction + + Util.isMacOS() + + + + Make a ${compiler:WRAPPER_LINK} symbolic link in ${installer:unixUserBinDir} + + makeSymbolicLinkAction + + ( Util.isLinux() || Util.isUnixInstaller() || ( Util.isMacOS() && ( context.getVariable("macWrapperLinkLocation") != null ) ) ) && ( context.getVariable("unixUserBinDir") != null ) + + + + +${i18n:ClickFinish} + +${compiler:JALVIEW_APPLICATION_NAME} will now launch. + + + + + +