X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Finstall4j%2Finstall4j8_template.install4j;h=53f7853bb7df43968b6d1c1028450fe47aff646a;hb=ecdae8027a9bad9e43f0ab12c54aec09fade15a1;hp=33e5d098604f17d2caaa6e5fb8bb622821da364e;hpb=12d3249a11f8ad086f310290f06eb475f6ac0424;p=jalview.git diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j index 33e5d09..53f7853 100644 --- a/utils/install4j/install4j8_template.install4j +++ b/utils/install4j/install4j8_template.install4j @@ -1,6 +1,6 @@ - - + + @@ -13,6 +13,7 @@ + @@ -32,8 +33,11 @@ - - + + + + + @@ -48,11 +52,36 @@ - - - + + + + - + + + *.dylib + *.so + *.jnilib + unpack200 + tnameserv + servertool + rmiregistry + rmid + policytool + pack200 + orbd + keytool + jjs + java + jspawnhelper + libfreetype.dylib.6 + applet + jaotc + jfr + jrunscript + libjli.dylib + + @@ -60,14 +89,12 @@ - - @@ -75,16 +102,19 @@ - - + + + + + + - @@ -112,19 +142,14 @@ - - - - - - + - + @@ -181,7 +206,7 @@ - ${compiler:JALVIEW_DIR}/resources/images/jalview_logo_background_fade-640x480.png + ${compiler:JALVIEW_DIR}/${compiler:BACKGROUND} @@ -219,6 +244,35 @@ + + + + + String userHome = (String)context.getVariable("sys.userHome"); + +String[] tryPaths = new String[] { + "bin", + ".local" + File.separator + "bin", + "local" + File.separator + "bin", + "opt" + File.separator + "bin" +}; + +for (int i = 0; i < tryPaths.length; i++) { + String tryPath = tryPaths[i]; + File unixUserBinDir = new File(userHome + File.separator + tryPath); + if (unixUserBinDir.exists()) { + return tryPath; + } +} + +return null; + + + + unixUserBinDir + + Util.isLinux() || Util.isUnixInstaller() + @@ -252,7 +306,7 @@ - ${compiler:JALVIEW_DIR}/resources/images/jalview_logo_background_fade-640x480.png + ${compiler:JALVIEW_DIR}/${compiler:BACKGROUND} @@ -465,7 +519,7 @@ return console.askOkCancel(message, true); - Creating file associations + Finished creating file associations @@ -479,19 +533,19 @@ return console.askOkCancel(message, true); - 737 + JALVIEW jalview - 737 + JALVIEW jalviews - 737 + JALVIEW ${compiler:EXTRA_SCHEME} @@ -563,6 +617,44 @@ return console.askOkCancel(message, true); context.getBooleanVariable("addToDockAction") + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT} + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK} + + + + !Util.isWindows() + + + + + ${installer:sys.contentDir}\${compiler:WRAPPER_SCRIPT_BIN_DIR} + Path + + context.getBooleanVariable("appendToPathAction") + + + + + + ${installer:sys.contentDir}/${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT} + + + + + ${installer:sys.userHome}/${installer:unixUserBinDir}/${compiler:WRAPPER_LINK} + + + + context.getBooleanVariable("makeSymbolicLink") && ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null ) + @@ -585,6 +677,22 @@ return console.askOkCancel(message, true); Util.isMacOS() + + + Add ${compiler:JALVIEW_APPLICATION_NAME}'s bin folder to the Path environment variable + + appendToPathAction + + Util.isWindows() + + + + Make a ${compiler:WRAPPER_LINK} symbolic link in ~/${installer:unixUserBinDir} + + makeSymbolicLink + + ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null ) + @@ -622,7 +730,7 @@ return console.askOkCancel(message, true); - ${compiler:JALVIEW_DIR}/resources/images/jalview_logo_background_fade-640x480.png + ${compiler:JALVIEW_DIR}/${compiler:BACKGROUND} @@ -687,7 +795,7 @@ return console.askYesNo(message, true); - + jre @@ -868,6 +976,26 @@ return console.askYesNo(message, true); build_* + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR} + + + + + bin + + + + + channel.props + + + + + channel.propsv + + @@ -920,7 +1048,7 @@ return console.askYesNo(message, true); - ${compiler:JALVIEW_DIR}/resources/images/jalview_logo_background_fade-640x480.png + ${compiler:JALVIEW_DIR}/${compiler:BACKGROUND} @@ -1127,13 +1255,12 @@ return console.askYesNo(message, true); - + - @@ -1144,7 +1271,7 @@ return console.askYesNo(message, true); - + @@ -1157,20 +1284,19 @@ return console.askYesNo(message, true); - - + + - - + + - + - @@ -1181,13 +1307,12 @@ return console.askYesNo(message, true); - + - @@ -1198,13 +1323,12 @@ return console.askYesNo(message, true); - + -