X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Finstall4j%2Finstall4j8_template.install4j;h=53f7853bb7df43968b6d1c1028450fe47aff646a;hb=ecdae8027a9bad9e43f0ab12c54aec09fade15a1;hp=8a0ea4f3f2b1072f278ef537491d0febdc20b7fb;hpb=c484ce0509810f1703969b605e13bf8e6c103be6;p=jalview.git diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j index 8a0ea4f..53f7853 100644 --- a/utils/install4j/install4j8_template.install4j +++ b/utils/install4j/install4j8_template.install4j @@ -1,7 +1,7 @@ - - - + + + @@ -9,9 +9,11 @@ + + @@ -28,7 +30,14 @@ - + + + + + + + + @@ -38,23 +47,54 @@ + + + + + + + + + - + + + *.dylib + *.so + *.jnilib + unpack200 + tnameserv + servertool + rmiregistry + rmid + policytool + pack200 + orbd + keytool + jjs + java + jspawnhelper + libfreetype.dylib.6 + applet + jaotc + jfr + jrunscript + libjli.dylib + + - + - - @@ -62,15 +102,19 @@ - - + + + + + + + - @@ -98,25 +142,20 @@ - - - - - - - - + + + - + - + @@ -125,17 +164,17 @@ 2350 2450 + 2641 - Categories=Science;Biology;Java; ${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")} - + - + @@ -167,7 +206,7 @@ - ${compiler:JALVIEW_DIR}/resources/images/jalview_logo_background_fade-640x480.png + ${compiler:JALVIEW_DIR}/${compiler:BACKGROUND} @@ -205,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() + @@ -238,7 +306,7 @@ - ${compiler:JALVIEW_DIR}/resources/images/jalview_logo_background_fade-640x480.png + ${compiler:JALVIEW_DIR}/${compiler:BACKGROUND} @@ -377,8 +445,32 @@ return console.askOkCancel(message, true); - + + + ${compiler:APPLICATION_CATEGORIES} + + + + Examples + + + examples + + + + + + ${compiler:JALVIEW_NAME} + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + !context.getBooleanVariable("sys.programGroupDisabled") + + + + + ${compiler:APPLICATION_CATEGORIES} + ${compiler:JALVIEW_NAME} ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} !context.getBooleanVariable("sys.programGroupDisabled") @@ -427,7 +519,7 @@ return console.askOkCancel(message, true); - Creating file associations + Finished creating file associations @@ -441,16 +533,22 @@ return console.askOkCancel(message, true); - 737 + JALVIEW jalview - 737 + JALVIEW jalviews + + + JALVIEW + ${compiler:EXTRA_SCHEME} + + @@ -465,20 +563,22 @@ return console.askOkCancel(message, true); - ${compiler:sys.shortName} + ${compiler:APPLICATION_CATEGORIES} + ${compiler:JALVIEW_APPLICATION_NAME} - ${compiler:sys.shortName} + ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} - ${compiler:JALVIEW_DIR}/resources/images/jalview_logos.ico + ${compiler:JALVIEW_DIR}/${compiler:WINDOWS_ICONS_FILE} + ${compiler:JALVIEW_NAME} - ${compiler:JALVIEW_DIR}/resources/images/JalviewLogo_Huge.png + ${compiler:JALVIEW_DIR}/${compiler:PNG_ICON_FILE} @@ -487,21 +587,21 @@ return console.askOkCancel(message, true); - ${compiler:sys.shortName} + ${compiler:JALVIEW_APPLICATION_NAME} - ${compiler:sys.shortName} + ${installer:sys.contentDir}/${compiler:EXECUTABLE_NAME} - ${compiler:sys.fullName} + ${compiler:JALVIEW_APPLICATION_NAME} - ${compiler:JALVIEW_DIR}/resources/images/JalviewLogo_Huge.png + ${compiler:JALVIEW_DIR}/${compiler:PNG_ICON_FILE} - ${compiler:JALVIEW_DIR}/resources/images/jalview_logos.ico + ${compiler:JALVIEW_DIR}/${compiler:WINDOWS_ICONS_FILE} @@ -511,12 +611,50 @@ return console.askOkCancel(message, true); - Jalview.app + ${compiler:JALVIEW_APPLICATION_NAME}.app 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 ) + @@ -539,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 ) + @@ -576,7 +730,7 @@ return console.askOkCancel(message, true); - ${compiler:JALVIEW_DIR}/resources/images/jalview_logo_background_fade-640x480.png + ${compiler:JALVIEW_DIR}/${compiler:BACKGROUND} @@ -641,7 +795,7 @@ return console.askYesNo(message, true); - + jre @@ -659,117 +813,117 @@ return console.askYesNo(message, true); - ${compiler:GETDOWN_DIST_DIR} + getdown-launcher.jar - ${compiler:GETDOWN_ALT_DIR} + getdown-launcher-old.jar - ${compiler:GETDOWN_RESOURCE_DIR} + getdown-launcher-new.jar - getdown-launcher.jar + gettingdown.lock - getdown-launcher-old.jar + jre.zip - getdown-launcher-new.jar + digest.txt - *.jarv + digest2.txt - gettingdown.lock + getdown-launcher.jarv - *.log + getdown-launcher-new.jarv - *.txt + launcher.log - *_new + proxy.txt - digest.txt + build_properties - digest2.txt + channel_launch*.jvl - getdown-launcher.jarv + jalview*.jvl - getdown-launcher-new.jarv + *.jarv - channel_launch*.jvl + *.log - launcher.log + *.txt - proxy.txt + *_new - META-INF + hs_err_*.* - install/getdown-launcher.jar + ${compiler:GETDOWN_DIST_DIR} - install/getdown.txt + ${compiler:GETDOWN_ALT_DIR} - install/build_properties + ${compiler:GETDOWN_RESOURCE_DIR} - build_properties + META-INF @@ -779,27 +933,67 @@ return console.askYesNo(message, true); - dist + resource - release + dist - alt + release - resource + alt - hs_err_*.* + dev + + + + + build + + + + + alt_* + + + + + dev_* + + + + + build_* + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR} + + + + + bin + + + + + channel.props + + + + + channel.propsv @@ -854,14 +1048,14 @@ return console.askYesNo(message, true); - ${compiler:JALVIEW_DIR}/resources/images/jalview_logo_background_fade-640x480.png + ${compiler:JALVIEW_DIR}/${compiler:BACKGROUND} - + @@ -1061,49 +1255,12 @@ return console.askYesNo(message, true); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - @@ -1114,50 +1271,48 @@ return console.askYesNo(message, true); - + - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + - @@ -1166,15 +1321,14 @@ return console.askYesNo(message, true); - - - + + + - @@ -1184,7 +1338,7 @@ return console.askYesNo(message, true); - + @@ -1194,5 +1348,6 @@ return console.askYesNo(message, true); +