X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Finstall4j%2Finstall4j9_template.install4j;h=23ff9c9c8c6bb57f9a4559ffe785046f6770bdc8;hb=efba321f20b819819c0b1cd9c9133d9d1a2ab314;hp=f01ed8e7a3c8bfba957c805e2b85c21b8cb20070;hpb=935a6e1d7804ebbc66039e315ea187c60516b1c1;p=jalview.git
diff --git a/utils/install4j/install4j9_template.install4j b/utils/install4j/install4j9_template.install4j
index f01ed8e..23ff9c9 100644
--- a/utils/install4j/install4j9_template.install4j
+++ b/utils/install4j/install4j9_template.install4j
@@ -40,7 +40,7 @@
-
+
@@ -105,16 +105,16 @@
-
+
-
+
-
+
@@ -145,7 +145,7 @@
-
+
@@ -160,6 +160,10 @@
+
+
+
+
2350
@@ -563,7 +567,7 @@ 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
- 737
+ JALVIEW
@@ -584,19 +588,19 @@ return console.askOkCancel(message, true);
- 737
+ JALVIEW
jalview
- 737
+ JALVIEW
jalviews
- 737
+ JALVIEW
${compiler:EXTRA_SCHEME}
@@ -704,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 )
@@ -719,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 )
@@ -734,6 +738,7 @@ return console.askOkCancel(message, true);
createDesktopLinkAction
+ !Util.isMacOS()
@@ -755,9 +760,9 @@ return console.askOkCancel(message, true);
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 )
@@ -1100,8 +1105,13 @@ return console.askYesNo(message, true);
-
+
+
+
+
${compiler:WRAPPER_LINK}_setup
${compiler:sys.fullName}
@@ -1115,7 +1125,46 @@ return console.askYesNo(message, true);
-
+
+
+ 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.
+
+
+
+
@@ -1371,7 +1420,7 @@ return console.askYesNo(message, true);
-
+
@@ -1387,7 +1436,7 @@ return console.askYesNo(message, true);
-
+
@@ -1404,11 +1453,11 @@ return console.askYesNo(message, true);
-
+
-
+
@@ -1424,7 +1473,7 @@ return console.askYesNo(message, true);
-
+
@@ -1440,7 +1489,7 @@ return console.askYesNo(message, true);
-
+