From 726a000617c44ae9e0b729add6d74708c0989971 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Mon, 9 Dec 2019 09:05:00 +0000 Subject: [PATCH] JAL-3449 More whitespace in installer. Tidying --- build.gradle | 11 +- utils/install4j/auto_file_associations.pl | 169 -- utils/install4j/bs_install4j_template.install4j | 1862 ----------------- .../install4j/file_associations_auto-install4j.xml | 1085 ---------- .../file_associations_template-install4j.xml | 35 - utils/install4j/install4j8_template.install4j | 8 + utils/install4j/install4j_template.install4j | 2140 -------------------- 7 files changed, 13 insertions(+), 5297 deletions(-) delete mode 100755 utils/install4j/auto_file_associations.pl delete mode 100644 utils/install4j/bs_install4j_template.install4j delete mode 100644 utils/install4j/file_associations_auto-install4j.xml delete mode 100644 utils/install4j/file_associations_template-install4j.xml delete mode 100644 utils/install4j/install4j_template.install4j diff --git a/build.gradle b/build.gradle index a6a3cec..770f3f2 100644 --- a/build.gradle +++ b/build.gradle @@ -1212,7 +1212,6 @@ install4j { task copyInstall4jTemplate { - def install4jTemplateFile = file("${install4jDir}/${install4j_template}") def install4jFileAssociationsFile = file("${install4jDir}/${install4j_installer_file_associations}") inputs.file(install4jTemplateFile) @@ -1220,14 +1219,14 @@ task copyInstall4jTemplate { outputs.file(install4jConfFile) doLast { - def install4j = new XmlParser().parse(install4jTemplateFile) + def install4jConfigXml = new XmlParser().parse(install4jTemplateFile) // turn off code signing if no OSX_KEYPASS if (OSX_KEYPASS == "") { - install4j.'**'.codeSigning.each { codeSigning -> + install4jConfigXml.'**'.codeSigning.each { codeSigning -> codeSigning.'@macEnabled' = "false" } - install4j.'**'.windows.each { windows -> + install4jConfigXml.'**'.windows.each { windows -> windows.'@runPostProcessor' = "false" } } @@ -1235,7 +1234,7 @@ task copyInstall4jTemplate { // put file association actions where placeholder action is def install4jFileAssociationsText = install4jFileAssociationsFile.text def fileAssociationActions = new XmlParser().parseText("${install4jFileAssociationsText}") - install4j.'**'.action.any { a -> + install4jConfigXml.'**'.action.any { a -> if (a.'@name' == 'EXTENSIONS_REPLACED_BY_GRADLE') { def parent = a.parent() parent.remove(a) @@ -1248,7 +1247,7 @@ task copyInstall4jTemplate { } // write install4j file - install4jConfFile.text = XmlUtil.serialize(install4j) + install4jConfFile.text = XmlUtil.serialize(install4jConfigXml) } } diff --git a/utils/install4j/auto_file_associations.pl b/utils/install4j/auto_file_associations.pl deleted file mode 100755 index 7613778..0000000 --- a/utils/install4j/auto_file_associations.pl +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env perl - -use strict; - -my $i4jversion = 7; -if ($ARGV[0] eq "-v") { - shift @ARGV; - $i4jversion = shift @ARGV; - die("-v i4jversion must be an integer [probably 7 or 8]") unless $i4jversion =~ m/^\d+$/; -} -# backwards compatibility -$i4jversion = "" if $i4jversion < 8; - -my $fileformats = $ARGV[0]; -$fileformats = "../../src/jalview/io/FileFormat.java" unless $fileformats; - -# default mimetype will be text/x-$shortname -# TODO: find an actual extension for mat, see JAL-Xxxxx for outstanding issues too -# TODO: look up standard mime type used for BLASTfmt matrices, etc -my $mimetypes = { - rnaml => "application/rnaml+xml", - biojson => "application/x-jalview-biojson+json", - jnet => "application/x-jalview-jnet+text", - features => "application/x-jalview-features+text", - scorematrix => "application/x-jalview-scorematrix+text", - pdb => "chemical/x-pdb", - mmcif => "chemical/x-cif", - mmcif2 => "chemical/x-mcif", - jalview => "application/x-jalview+xml+zip", - jvl => "application/x-jalview-jvl+text", - annotations => "application/x-jalview-annotations+text", -}; - -my @dontaddshortname = qw(features json); -my @dontaddextension = qw(html xml json jar mfa fastq); -my $add_associations = { - biojson => {shortname=>"biojson",name=>"BioJSON",extensions=>["biojson"]}, - gff2 => {shortname=>"gff2",name=>"Generic Features Format v2",extensions=>["gff2"]}, - gff3 => {shortname=>"gff3",name=>"Generic Features Format v3",extensions=>["gff3"]}, - features => {shortname=>"features",name=>"Jalview Features",extensions=>["features","jvfeatures"]}, - annotations => {shortname=>"annotations",name=>"Jalview Annotations",extensions=>["annotations","jvannotations"]}, - mmcif2 => {shortname=>"mmcif2",name=>"mmCIF",extensions=>["mcif","mmcif"]}, - jvl => {shortname=>"jvl",name=>"Jalview Version Locator",extensions=>["jvl"],iconfile=>"Jalview-Version-Locator"}, - jnet => {shortname=>"jnet",name=>"JnetFile",extensions=>["concise","jnet"]}, - scorematrix => {shortname=>"scorematrix",name=>"Substitution Matrix",extensions=>["mat"]}, -}; -my $add_extensions = { - blc => ["blc"], -}; -my @put_first = qw(jalview jvl); - -my $mactemplatefile = "file_associations_template-Info_plist.xml"; -my $i4jtemplatefile = ($i4jversion >= 8)?"file_associations_template-install4j${i4jversion}.xml"; -my $mactemplate; -my $i4jtemplate; -open(MT,"<$mactemplatefile") or dir("Could not open '$mactemplatefile' for reading"); -while(){ - $mactemplate .= $_; -} -close(MT); -open(IT,"<$i4jtemplatefile") or dir("Could not open '$i4jtemplatefile' for reading"); -while(){ - $i4jtemplate .= $_; -} -close(IT); -my $macauto; -my $i4jauto; - -my $macautofile = $mactemplatefile; -$macautofile =~ s/template/auto$1/; -my $i4jautofile = $i4jtemplatefile; -$i4jautofile =~ s/template/auto$1/; - -open(MA,">$macautofile") or die ("Could not open '$macautofile' for writing"); -print MA "CFBundleDocumentTypes\n\n\n"; -open(IA,">$i4jautofile") or die ("Could not open '$i4jautofile' for writing"); - -open(IN, "<$fileformats") or die ("Could not open '$fileformats' for reading"); -my $id = 10000; -my $file_associations = {}; -while(my $line = ) { - $line =~ s/\s+/ /g; - $line =~ s/(^ | $)//g; - if ($line =~ m/^(\w+) ?\( ?"([^"]*)" ?, ?"([^"]*)" ?, ?(true|false) ?, ?(true|false) ?\)$/i) { - my $shortname = lc($1); - next if (grep($_ eq $shortname, @dontaddshortname)); - my $name = $2; - my $extensions = $3; - $extensions =~ s/\s+//g; - my @possextensions = split(m/,/,$extensions); - my @extensions; - my $addext = $add_extensions->{$shortname}; - if (ref($addext) eq "ARRAY") { - push(@possextensions, @$addext); - } - for my $possext (@possextensions) { - next if grep($_ eq $possext, @extensions); - next if grep($_ eq $possext, @dontaddextension); - push(@extensions,$possext); - } - next unless scalar(@extensions); - $file_associations->{$shortname} = { - shortname => $shortname, - name => $name, - extensions => \@extensions - }; - warn("Adding file association for $shortname\n"); - } -} -close(IN); - -my %all_associations = (%$file_associations, %$add_associations); - -for my $shortname (@put_first, sort keys %all_associations) { - my $a = $all_associations{$shortname}; - if (ref($a) ne "HASH") { - next; - } - - my $name = $a->{name}; - my $extensions = $a->{extensions}; - my $mimetype = $mimetypes->{$shortname}; - $mimetype = "text/x-$shortname" unless $mimetype; - - my $iconfile = $a->{iconfile}; - $iconfile = "Jalview-File" unless $iconfile; - - my @extensions = @$extensions; - #warn("LINE: $line\nFound extensions '".join("', '", @extensions)."' for $name Files ($shortname)'n"); - - my $macentry = $mactemplate; - my $i4jentry = $i4jtemplate; - - $macentry =~ s/\$\$NAME\$\$/$name/g; - $macentry =~ s/\$\$SHORTNAME\$\$/$shortname/g; - $macentry =~ s/\$\$MIMETYPE\$\$/$mimetype/g; - $macentry =~ s/\$\$ICONFILE\$\$/$iconfile/g; - - $i4jentry =~ s/\$\$NAME\$\$/$name/g; - $i4jentry =~ s/\$\$SHORTNAME\$\$/$shortname/g; - $i4jentry =~ s/\$\$MIMETYPE\$\$/$mimetype/g; - $i4jentry =~ s/\$\$ICONFILE\$\$/$iconfile/g; - - while ($macentry =~ m/\$\$([^\$]*)EXTENSIONS([^\$]*)\$\$/) { - my $pre = $1; - my $post = $2; - my $macextensions; - for my $ext (@extensions) { - $macextensions .= $pre.$ext.$post; - } - $macentry =~ s/\$\$${pre}EXTENSIONS${post}\$\$/$macextensions/g; - } - print MA $macentry; - - for my $ext (@extensions) { - my $i4jextentry = $i4jentry; - $i4jextentry =~ s/\$\$EXTENSION\$\$/$ext/g; - $i4jextentry =~ s/\$\$ID\$\$/$id/g; - $id++; - - print IA $i4jextentry; - } - - delete $all_associations{$shortname}; -} - -close(IA); -print MA "\n"; -close(MA); diff --git a/utils/install4j/bs_install4j_template.install4j b/utils/install4j/bs_install4j_template.install4j deleted file mode 100644 index b76d779..0000000 --- a/utils/install4j/bs_install4j_template.install4j +++ /dev/null @@ -1,1862 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/file_associations_auto-install4j.xml b/utils/install4j/file_associations_auto-install4j.xml deleted file mode 100644 index 192b5d2..0000000 --- a/utils/install4j/file_associations_auto-install4j.xml +++ /dev/null @@ -1,1085 +0,0 @@ - - - - - - Jalview File - - - jvp - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Jalview Version Locator File - - - jvl - - - 737 - - - - Jalview-Version-Locator.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-Version-Locator.ico - - - - - - - - - - - - - - AMSA File - - - amsa - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Jalview Annotations File - - - annotations - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Jalview Annotations File - - - jvannotations - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - BioJSON File - - - biojson - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - BLC File - - - BLC - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - BLC File - - - blc - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Clustal File - - - aln - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Fasta File - - - fa - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Fasta File - - - fasta - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Jalview Features File - - - features - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Jalview Features File - - - jvfeatures - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Generic Features Format v2 File - - - gff2 - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Generic Features Format v3 File - - - gff3 - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - JnetFile File - - - concise - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - JnetFile File - - - jnet - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - mmCIF File - - - cif - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - mmCIF File - - - mcif - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - mmCIF File - - - mmcif - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - MSF File - - - msf - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - PDB File - - - pdb - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - PDB File - - - ent - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - PFAM File - - - pfam - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - PHYLIP File - - - phy - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - PileUp File - - - pileup - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - PIR File - - - pir - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - RNAML File - - - rnaml - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Substitution Matrix File - - - mat - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Stockholm File - - - sto - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - - - - - - - Stockholm File - - - stk - - - 737 - - - - Jalview-File.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - Jalview-File.ico - - - - - - - - diff --git a/utils/install4j/file_associations_template-install4j.xml b/utils/install4j/file_associations_template-install4j.xml deleted file mode 100644 index 697029a..0000000 --- a/utils/install4j/file_associations_template-install4j.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - $$NAME$$ File - - - $$EXTENSION$$ - - - 737 - - - - $$ICONFILE$$.icns - - - - - com.install4j.runtime.beans.actions.desktop.MacAssociationRole - EDITOR - - - - - $$ICONFILE$$.ico - - - - - - - - diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j index f9d5c8f..5f45175 100644 --- a/utils/install4j/install4j8_template.install4j +++ b/utils/install4j/install4j8_template.install4j @@ -838,6 +838,14 @@ return console.askYesNo(message, true); + + + 255 + 255 + 255 + 255 + + ../../resources/images/jalview_logo_background_fade-640x480.png diff --git a/utils/install4j/install4j_template.install4j b/utils/install4j/install4j_template.install4j deleted file mode 100644 index d1c85e9..0000000 --- a/utils/install4j/install4j_template.install4j +++ /dev/null @@ -1,2140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - labelText - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - allowSpacesOnUnix - checkFreeSpace - checkWritable - existingDirWarning - manualEntryAllowed - showFreeDiskSpace - showRequiredDiskSpace - standardValidation - suggestAppDir - validateApplicationId - validationScript - - - - - - - - - - - - - - - - - - - - - - - ${i18n:SelectComponentsLabel2} - - - - - - !context.isConsole() - - - - - - - - true - - - - - - - - selectionChangedScript - - - - - - - - - - - - - - - - - - - - - - - ${i18n:SelectAssociationsLabel} - - - - - - - - - - - - - - true - - - true - - - - - - - - showSelectionButtons - selectionButtonPosition - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} - - - - - !context.getBooleanVariable("sys.programGroupDisabled") - - - - - - - ${compiler:sys.fullName} ${compiler:sys.version} - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - 121 - - - - - - - - - - - - - - - - - ${i18n:WizardPreparing} - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - ${compiler:sys.shortName} - - - - ${compiler:sys.shortName} - - - - - ../../resources/images/jalview_logos.ico - - - - - ../../resources/images/JalviewLogo_Huge.png - - - - - - !context.getBooleanVariable("sys.programGroupDisabled") - - - - - - - false - - - ${compiler:sys.shortName} - - - - ${compiler:sys.shortName} - - - - ${compiler:sys.fullName} - - - - ../../resources/images/JalviewLogo_Huge.png - - - - - ../../resources/images/jalview_logos.ico - - - - - - context.getBooleanVariable("createDesktopLinkAction") - - - - - - - - Jalview.app - - - - - - context.getBooleanVariable("addToDockAction") - - - - - - - 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 - - - - - - - - - - - - - - ${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 - - - - - - - - - - - - - - - - - - - - - 95 - - - - - - - - - - - - - - - jre - - - - - jre.jar - - - - - .install4j - - - - - $$GETDOWN_DIST_DIR$$ - - - - - $$GETDOWN_ALT_DIR$$ - - - - - $$GETDOWN_RESOURCE_DIR$$ - - - - - getdown-launcher.jar - - - - - getdown-launcher-old.jar - - - - - getdown-launcher-new.jar - - - - - *.jarv - - - - - gettingdown.lock - - - - - *.log - - - - - *.txt - - - - - *_new - - - - - digest.txt - - - - - digest2.txt - - - - - getdown-launcher.jarv - - - - - getdown-launcher-new.jarv - - - - - channel_launch.jvl - - - - - launcher.log - - - - - proxy.txt - - - - - META-INF - - - - - install/getdown-launcher.jar - - - - - install/getdown.txt - - - - - install/build_properties - - - - - build_properties - - - - - install - - - - - dist - - - - - release - - - - - alt - - - - - resource - - - - - - true - - - - - - - - - - - - 100 - - - - - - - - - - - - - - ${i18n:UninstallerPreparing} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${form:successMessage} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 1.7.10.2