From 2b6ddd0d59088932a61f2beb69a1eab30c412738 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Thu, 2 May 2019 12:11:09 +0100 Subject: [PATCH] JAL-3247 jvp jvl File associations, JRE variablised, Windows-Userspace path default --- utils/install4j/Info_plist_file_associations.txt | 40 + utils/install4j/Jalview-File.icns | Bin 0 -> 3857 bytes utils/install4j/Jalview-File.ico | Bin 0 -> 1470 bytes .../install4j}/JalviewVersionLocator.png | Bin 28823 -> 28823 bytes utils/install4j/bs_install4j_template.install4j | 1862 ++++++++++++++++++++ utils/install4j/install4j_template.install4j | 58 +- 6 files changed, 1917 insertions(+), 43 deletions(-) create mode 100644 utils/install4j/Info_plist_file_associations.txt create mode 100644 utils/install4j/Jalview-File.icns create mode 100644 utils/install4j/Jalview-File.ico rename {resources/images => utils/install4j}/JalviewVersionLocator.png (100%) create mode 100644 utils/install4j/bs_install4j_template.install4j 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 0000000000000000000000000000000000000000..a589f0509fb3a6310e6eba2367060ca6bd3f0522 GIT binary patch literal 3857 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 I+exYa1x9G_`v3p{ literal 0 HcmV?d00001 diff --git a/utils/install4j/Jalview-File.ico b/utils/install4j/Jalview-File.ico new file mode 100644 index 0000000000000000000000000000000000000000..694d18038c9eaba28381024bfe96d9c60ae1eadb GIT binary patch literal 1470 zcmeH{TTD`M9LK*FmX(&-{l>APpo>wNrd`Y~7Fl+&k^~!wVVXLp6Gv^ybRffCoVwvA zDsJgm&$S+WY&}(LwF0AzAr;Ow6AM^Wqu=429)0Se7yoCU^V#|AzjO9K|LqUN(Up=6 zx+lO953B?rAySA`g6%Vns7QpUREiHd3b=DsaLaDMUvLeRMJfao3WSJhr4n~#j}R^? zK~SZFDgQBoYBfScgb0+DB1D9V2~{stQK= zGd$4Rai`dYNNp`1YVRRZSBEDzt*~7m#%+}gx71D;G){Q*dc4+|ald*PBL)L%YP|Sp zG{S8%VU!qaZH14huOElkY(_(apBTq`i-kM^oz4$$TN^$RI^8rH8w1em19;lefu^P} zaCUa$xz&o6mMOd>H#di2G)`iwyBj9ccf9TC!5f3(>BcZ*+1}K{(zDl+1W8Eb6EqihqN@V zon#H{h>fJpYu2w=y>VgE+T>OIyo?NPUNLLFDHL2|So5v0kZUs5e3Q$$c9=Ea^76RG zum;X9UY4*#AlSrQUVd@i9KpPJI@I + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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); - + -- 1.7.10.2