From: Ben Soares Date: Thu, 2 May 2019 11:11:09 +0000 (+0100) Subject: JAL-3247 jvp jvl File associations, JRE variablised, Windows-Userspace path default X-Git-Tag: Release_2_11_0~12^2^2~20 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2b6ddd0d59088932a61f2beb69a1eab30c412738;p=jalview.git JAL-3247 jvp jvl File associations, JRE variablised, Windows-Userspace path default --- diff --git a/utils/install4j/Info_plist_file_associations.txt b/utils/install4j/Info_plist_file_associations.txt new file mode 100644 index 0000000..d4a5190 --- /dev/null +++ b/utils/install4j/Info_plist_file_associations.txt @@ -0,0 +1,40 @@ + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + jvp + + CFBundleTypeIconFile + Jalview-File + CFBundleTypeMIMETypes + + application/x-jalview-project + + CFBundleTypeName + Jalview Project File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + + + CFBundleTypeExtensions + + jvl + + CFBundleTypeIconFile + Jalview-Version-Locator + CFBundleTypeMIMETypes + + application/x-jalview-version-locator + + CFBundleTypeName + Jalview Version Locator + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + + + diff --git a/utils/install4j/Jalview-File.icns b/utils/install4j/Jalview-File.icns new file mode 100644 index 0000000..a589f05 Binary files /dev/null and b/utils/install4j/Jalview-File.icns differ diff --git a/utils/install4j/Jalview-File.ico b/utils/install4j/Jalview-File.ico new file mode 100644 index 0000000..694d180 Binary files /dev/null and b/utils/install4j/Jalview-File.ico differ diff --git a/resources/images/JalviewVersionLocator.png b/utils/install4j/JalviewVersionLocator.png similarity index 100% rename from resources/images/JalviewVersionLocator.png rename to utils/install4j/JalviewVersionLocator.png diff --git a/utils/install4j/bs_install4j_template.install4j b/utils/install4j/bs_install4j_template.install4j new file mode 100644 index 0000000..b76d779 --- /dev/null +++ b/utils/install4j/bs_install4j_template.install4j @@ -0,0 +1,1862 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + 255 + 255 + 255 + 255 + + + + + + true + + + + + + 255 + 255 + 255 + 255 + + + + true + + + + ../../resources/images/jalview_logo_background_fade-640x480.png + + + + + 5 + 10 + 10 + 10 + + + + + + + + imageAnchor + imageEdgeBackgroundColor + imageFile + + + + + + + + + + false + + + install4j + + + + + + + + labelText + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 255 + 255 + 255 + 255 + + + + + + true + + + + + + 25 + 143 + 220 + 255 + + + + true + + + + ../../resources/images/jalview_logo_background_fade-640x480.png + + + + + 5 + 10 + 10 + 10 + + + + + + + + imageAnchor + imageEdgeBackgroundColor + imageFile + + + + + + + + + + + + + + + + + sys.installationDir + + + + + + + context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + + + + + ${form:welcomeMessage} + + + + + + !context.isConsole() + + + + + + + + + + String message = context.getMessage("ConsoleWelcomeLabel", context.getApplicationName()); +return console.askOkCancel(message, true); + + + + + + + + + + + + + + + + + + + + + updateCheck + + + + + + + + ${i18n:ClickNext} + + + + + + + + + + + + + + + + + + !context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + + + + + + + + sys.installationDir + + + + + + + context.getVariable("sys.responseFile") == null + + + + + + + + + ${i18n:SelectDirLabel(${compiler:sys.fullName})} + + + + + + + + + + + + + + true + + + + + + + + suggestAppDir + validateApplicationId + existingDirWarning + checkWritable + manualEntryAllowed + checkFreeSpace + showRequiredDiskSpace + showFreeDiskSpace + allowSpacesOnUnix + validationScript + standardValidation + + + + + + + + + + + + + + + + + + + + + + + ${i18n:SelectComponentsLabel2} + + + + + + !context.isConsole() + + + + + + + + true + + + + + + + + selectionChangedScript + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + + + + !context.getBooleanVariable("sys.programGroupDisabled") + + + + + + + ${compiler:sys.fullName} ${compiler:sys.version} + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + 121 + + + + + + + + + + + + + + + + + ${i18n:WizardPreparing} + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${compiler:sys.fullName} + + + + + context.getBooleanVariable("createDesktopLinkAction") + + + + + + + + + + + + + + + + context.getBooleanVariable("addToDockAction") + + + + + + + Jalview Project File + + + jvp + + + 121 + + + + ../../resources/images/file.png + + + + + com.install4j.runtime.beans.actions.desktop.MacAssociationRole + EDITOR + + + + + ../../resources/images/file.png + + + + + + + + + + + + + + + ${form:finishedMessage} + + + + + + + + + + + + + + ${i18n:CreateDesktopIcon} + + + true + + + createDesktopLinkAction + + + + + + + + + + + + + + ${i18n:AddToDock} + + + true + + + addToDockAction + + + + + + Util.isMacOS() + + + + + + + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + + true + + + + + + + + + + + + + 255 + 255 + 255 + 255 + + + + + + true + + + + + + 192 + 192 + 192 + 255 + + + + true + + + + ../../resources/images/jalview_logo_background_fade-640x480.png + + + + + 5 + 10 + 10 + 10 + + + + + + + + imageAnchor + imageEdgeBackgroundColor + imageFile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${form:welcomeMessage} + + + + + + !context.isConsole() + + + + + + + + + + String message = context.getMessage("ConfirmUninstall", context.getApplicationName()); +return console.askYesNo(message, true); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.install4j.runtime.beans.actions.control.ProgressChangeType + SET_INDETERMINATE + + + + + + + + + + + + + + + + + + + + + + com.install4j.runtime.beans.actions.control.ProgressChangeType + SET_DETERMINATE + + + + + + + + + + + + + 90 + + + + + + + + + + + + + + + jre + + + + + .install4j + + + + + dist + + + + + resource + + + + + getdown-launcher.jar + + + + + getdown-launcher-old.jar + + + + + getdown-launcher-new.jar + + + + + digest.txt + + + + + digest2.txt + + + + + getdown.txt + + + + + getdown-launcher.jarv + + + + + gettingdown.lock + + + + + launcher.log + + + + + proxy.txt + + + + + + true + + + + + + + + + + + + 100 + + + + + + + + + + + + + + ${i18n:UninstallerPreparing} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${form:successMessage} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/utils/install4j/install4j_template.install4j b/utils/install4j/install4j_template.install4j index 540d736..12cff87 100644 --- a/utils/install4j/install4j_template.install4j +++ b/utils/install4j/install4j_template.install4j @@ -109,7 +109,7 @@ - + @@ -142,40 +142,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -741,7 +708,7 @@ return console.askOkCancel(message, true); - ../../resources/images/file.png + ./Jalview-File.icns @@ -752,7 +719,7 @@ return console.askOkCancel(message, true); - ../../resources/images/file.png + ./Jalview-File.ico @@ -1052,7 +1019,7 @@ return console.askYesNo(message, true); - + jre @@ -1090,17 +1057,22 @@ return console.askYesNo(message, true); - digest.txt + *.jarv - digest2.txt + gettingdown.lock - getdown.txt + *.log + + + + + *.txt @@ -1724,7 +1696,7 @@ return console.askYesNo(message, true); - + @@ -1770,7 +1742,7 @@ return console.askYesNo(message, true); - +