From: Ben Soares Date: Thu, 29 Aug 2019 15:01:02 +0000 (+0100) Subject: JAL-3420 JAL-3394 Correct format of XML in added file extensions for install4j8.... X-Git-Tag: Develop-2_11_2_0-d20201215~80^2~28^2~30^2~2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8ee4a20c367cb4fcda616611646710593dc98b60;p=jalview.git JAL-3420 JAL-3394 Correct format of XML in added file extensions for install4j8. Also progress indicator for adding file associations (which can be slow). Still not entirely working, see comments in issue. --- diff --git a/build.gradle b/build.gradle index 6024b84..8d84b25 100644 --- a/build.gradle +++ b/build.gradle @@ -1118,6 +1118,14 @@ task copyInstall4jTemplate(type: Copy) { } } into install4jDir + + inputs.files(i4jTemplate) + if (install4jVersion >= 8) { + inputs.files(install4jDir+"/"+install4j8InstallerFileAssociations) + } else { + inputs.files(install4jDir+"/"+install4jInstallerFileAssociations) + inputs.files(install4jDir+"/"+install4jInfoPlistFileAssociations) + } outputs.files(install4jConf) doLast { diff --git a/utils/install4j/Jalview-File.png b/utils/install4j/Jalview-File.png new file mode 100644 index 0000000..1d98699 Binary files /dev/null and b/utils/install4j/Jalview-File.png differ diff --git a/utils/install4j/Jalview-Launch.icns b/utils/install4j/Jalview-Launch.icns new file mode 100644 index 0000000..506b5a1 Binary files /dev/null and b/utils/install4j/Jalview-Launch.icns differ diff --git a/utils/install4j/Jalview-Launch.ico b/utils/install4j/Jalview-Launch.ico new file mode 100644 index 0000000..4a2545b Binary files /dev/null and b/utils/install4j/Jalview-Launch.ico differ diff --git a/utils/install4j/Jalview-Launch.png b/utils/install4j/Jalview-Launch.png new file mode 100644 index 0000000..cb2ce97 Binary files /dev/null and b/utils/install4j/Jalview-Launch.png differ diff --git a/utils/install4j/JalviewVersionLocator.png b/utils/install4j/JalviewVersionLocator.png deleted file mode 100644 index 9441080..0000000 Binary files a/utils/install4j/JalviewVersionLocator.png and /dev/null differ diff --git a/utils/install4j/auto_file_associations-i4j8.pl b/utils/install4j/auto_file_associations-i4j8.pl index c8299f6..9a607c6 100755 --- a/utils/install4j/auto_file_associations-i4j8.pl +++ b/utils/install4j/auto_file_associations-i4j8.pl @@ -38,7 +38,7 @@ my $add_associations = { 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"}, + jvl => {shortname=>"jvl",name=>"Jalview Launch",extensions=>["jvl"],iconfile=>"Jalview-Launch"}, jnet => {shortname=>"jnet",name=>"JnetFile",extensions=>["concise","jnet"]}, scorematrix => {shortname=>"scorematrix",name=>"Substitution Matrix",extensions=>["mat"]}, }; @@ -50,16 +50,31 @@ my @put_first = qw(jalview jvl); my $v = ($i4jversion >= 8)?$i4jversion:""; my $i4jtemplatefile = "file_associations_template-install4j${v}.xml"; my $i4jtemplate; -open(IT,"<$i4jtemplatefile") or dir("Could not open '$i4jtemplatefile' for reading"); +my $mactemplatefile = "file_associations_template-Info_plist.xml"; +my $mactemplate; + +open(MT,"<$mactemplatefile") or die("Could not open '$mactemplatefile' for reading"); +while(){ + $mactemplate .= $_; +} +close(MT); +open(IT,"<$i4jtemplatefile") or die("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"); @@ -74,7 +89,7 @@ while(my $line = ) { my $name = $2; my $extensions = $3; $extensions =~ s/\s+//g; - my @possextensions = split(m/,/,$extensions); + my @possextensions = map(lc($_),split(m/,/,$extensions)); my @extensions; my $addext = $add_extensions->{$shortname}; if (ref($addext) eq "ARRAY") { @@ -98,16 +113,36 @@ 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 $num = 0; +my $i4jcount = 0; +my @ordered = @put_first; +for my $key (sort keys %all_associations) { + next if grep($_ eq $key, @ordered); + push(@ordered, $key); +} +for my $key (@ordered) { + my $a = $all_associations{$key}; + next if (ref($a) ne "HASH"); + + my $extensions = $a->{extensions}; + my @extensions = @$extensions; + for my $ext (@extensions) { + $num++; } + #delete $all_associations{$shortname}; + #print "NUM: $num\n"; +} + + +for my $shortname (@ordered) { + my $a = $all_associations{$shortname}; + next if (ref($a) ne "HASH"); my $name = $a->{name}; my $extensions = $a->{extensions}; my $mimetype = $mimetypes->{$shortname}; - $mimetype = "text/x-$shortname" unless $mimetype; + $mimetype = "application/x-$shortname+txt" unless $mimetype; + #$mimetype = "application/x-$shortname" unless $mimetype; my $iconfile = $a->{iconfile}; $iconfile = "Jalview-File" unless $iconfile; @@ -115,18 +150,50 @@ for my $shortname (@put_first, sort keys %all_associations) { my @extensions = @$extensions; #warn("LINE: $line\nFound extensions '".join("', '", @extensions)."' for $name Files ($shortname)'n"); - my $i4jentry = $i4jtemplate; + my $xname = xml_escape($name); + my $xmimetype = xml_escape($mimetype); + my $xshortname = xml_escape($shortname); + my $xiconfile = xml_escape($iconfile); + + my $macentry = $mactemplate; + $macentry =~ s/\$\$NAME\$\$/$xname/g; + $macentry =~ s/\$\$SHORTNAME\$\$/$xshortname/g; + $macentry =~ s/\$\$MIMETYPE\$\$/$xmimetype/g; + $macentry =~ s/\$\$ICONFILE\$\$/$xiconfile/g; + while ($macentry =~ m/\$\$([^\$]*)EXTENSIONS([^\$]*)\$\$/) { + my $pre = $1; + my $post = $2; + my $macextensions; + for my $ext (@extensions) { + my $xext = xml_escape($ext); + $macextensions .= $pre.$xext.$post; + } + $macentry =~ s/\$\$${pre}EXTENSIONS${post}\$\$/$macextensions/g; + } + print MA $macentry; - $i4jentry =~ s/\$\$NAME\$\$/$name/g; - $i4jentry =~ s/\$\$SHORTNAME\$\$/$shortname/g; - $i4jentry =~ s/\$\$MIMETYPE\$\$/$mimetype/g; - $i4jentry =~ s/\$\$ICONFILE\$\$/$iconfile/g; + my $i4jentry = $i4jtemplate; + $i4jentry =~ s/\$\$NAME\$\$/$xname/g; + $i4jentry =~ s/\$\$SHORTNAME\$\$/$xshortname/g; + $i4jentry =~ s/\$\$MIMETYPE\$\$/$xmimetype/g; + $i4jentry =~ s/\$\$ICONFILE\$\$/$xiconfile/g; for my $ext (@extensions) { + $i4jcount++; + #print "COUNT: $i4jcount\n"; + my $progresspercent = int(($i4jcount/$num)*100); + #print "PC: $progresspercent\n"; + $progresspercent = 100 if $progresspercent > 100; + my $xext = xml_escape($ext); my $i4jextentry = $i4jentry; - $i4jextentry =~ s/\$\$EXTENSION\$\$/$ext/g; + $i4jextentry =~ s/\$\$EXTENSION\$\$/$xext/g; + $i4jextentry =~ s/\$\$PROGRESSPERCENT\$\$/$progresspercent/g; $i4jextentry =~ s/\$\$ID\$\$/$id/g; $id++; + $i4jextentry =~ s/\$\$ID1\$\$/$id/g; + $id++; + $i4jextentry =~ s/\$\$ID2\$\$/$id/g; + $id++; print IA $i4jextentry; } @@ -135,3 +202,12 @@ for my $shortname (@put_first, sort keys %all_associations) { } close(IA); +print MA "\n"; +close(MA); + +sub xml_escape { + my $x = shift; + # stolen from Pod::Simple::XMLOutStream in base distro + $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg; + return $x; +} diff --git a/utils/install4j/file_associations_auto-Info_plist.xml b/utils/install4j/file_associations_auto-Info_plist.xml index da2633b..5922f2d 100644 --- a/utils/install4j/file_associations_auto-Info_plist.xml +++ b/utils/install4j/file_associations_auto-Info_plist.xml @@ -26,9 +26,9 @@ jvl CFBundleTypeName -Jalview Version Locator File +Jalview Launch File CFBundleTypeIconFile -Jalview-Version-Locator.icns +Jalview-Launch.icns CFBundleTypeRole Editor CFBundleTypeMIMETypes @@ -52,7 +52,7 @@ Editor CFBundleTypeMIMETypes -text/x-amsa +application/x-amsa+txt LSIsAppleDefaultForType @@ -100,7 +100,6 @@ CFBundleTypeExtensions -BLC blc CFBundleTypeName @@ -111,7 +110,7 @@ Editor CFBundleTypeMIMETypes -text/x-blc +application/x-blc+txt LSIsAppleDefaultForType @@ -130,7 +129,7 @@ Editor CFBundleTypeMIMETypes -text/x-clustal +application/x-clustal+txt LSIsAppleDefaultForType @@ -150,7 +149,7 @@ Editor CFBundleTypeMIMETypes -text/x-fasta +application/x-fasta+txt LSIsAppleDefaultForType @@ -189,7 +188,7 @@ Editor CFBundleTypeMIMETypes -text/x-gff2 +application/x-gff2+txt LSIsAppleDefaultForType @@ -208,7 +207,7 @@ Editor CFBundleTypeMIMETypes -text/x-gff3 +application/x-gff3+txt LSIsAppleDefaultForType @@ -286,7 +285,7 @@ Editor CFBundleTypeMIMETypes -text/x-msf +application/x-msf+txt LSIsAppleDefaultForType @@ -325,7 +324,7 @@ Editor CFBundleTypeMIMETypes -text/x-pfam +application/x-pfam+txt LSIsAppleDefaultForType @@ -344,7 +343,7 @@ Editor CFBundleTypeMIMETypes -text/x-phylip +application/x-phylip+txt LSIsAppleDefaultForType @@ -363,7 +362,7 @@ Editor CFBundleTypeMIMETypes -text/x-pileup +application/x-pileup+txt LSIsAppleDefaultForType @@ -382,7 +381,7 @@ Editor CFBundleTypeMIMETypes -text/x-pir +application/x-pir+txt LSIsAppleDefaultForType @@ -440,7 +439,7 @@ Editor CFBundleTypeMIMETypes -text/x-stockholm +application/x-stockholm+txt LSIsAppleDefaultForType diff --git a/utils/install4j/file_associations_auto-install4j8.xml b/utils/install4j/file_associations_auto-install4j8.xml index ab44bb5..52438d1 100644 --- a/utils/install4j/file_associations_auto-install4j8.xml +++ b/utils/install4j/file_associations_auto-install4j8.xml @@ -1,682 +1,1260 @@ - - - Jalview File - jvp - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Jalview Version Locator File - jvl - 737 - - - Jalview-Version-Locator.icns - - - - - - - Jalview-Version-Locator.ico - - - - - - - - - - AMSA File - amsa - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Jalview Annotations File - annotations - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Jalview Annotations File - jvannotations - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - BioJSON File - biojson - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - BLC File - BLC - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - BLC File - blc - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Clustal File - aln - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Fasta File - fa - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Fasta File - fasta - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Jalview Features File - features - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Jalview Features File - jvfeatures - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Generic Features Format v2 File - gff2 - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Generic Features Format v3 File - gff3 - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - JnetFile File - concise - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - JnetFile File - jnet - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - mmCIF File - cif - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - mmCIF File - mcif - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - mmCIF File - mmcif - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - MSF File - msf - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - PDB File - pdb - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - PDB File - ent - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - PFAM File - pfam - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - PHYLIP File - phy - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - PileUp File - pileup - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - PIR File - pir - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - RNAML File - rnaml - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Substitution Matrix File - mat - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Stockholm File - sto - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - - - - - Stockholm File - stk - 737 - - - Jalview-File.icns - - - - - - - Jalview-File.ico - - - - - - + + + Jalview (.jvp) + Creating file associations... + + + + + + + + + + + + + Jalview File + jvp + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-jalview+xml+zip + + + Jalview-File.ico + + + + + + + + Jalview Launch (.jvl) + Creating file associations... + + + + + + + + + + + + + Jalview Launch File + jvl + 737 + + + Jalview-Launch.icns + + + + + + + + + Jalview-Launch.png + + + application/x-jalview-jvl+text + + + Jalview-Launch.ico + + + + + + + + AMSA (.amsa) + Creating file associations... + + + + + + + + + + + + + AMSA File + amsa + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-amsa+txt + + + Jalview-File.ico + + + + + + + + Jalview Annotations (.annotations) + Creating file associations... + + + + + + + + + + + + + Jalview Annotations File + annotations + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-jalview-annotations+text + + + Jalview-File.ico + + + + + + + + Jalview Annotations (.jvannotations) + Creating file associations... + + + + + + + + + + + + + Jalview Annotations File + jvannotations + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-jalview-annotations+text + + + Jalview-File.ico + + + + + + + + BioJSON (.biojson) + Creating file associations... + + + + + + + + + + + + + BioJSON File + biojson + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-jalview-biojson+json + + + Jalview-File.ico + + + + + + + + BLC (.blc) + Creating file associations... + + + + + + + + + + + + + BLC File + blc + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-blc+txt + + + Jalview-File.ico + + + + + + + + Clustal (.aln) + Creating file associations... + + + + + + + + + + + + + Clustal File + aln + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-clustal+txt + + + Jalview-File.ico + + + + + + + + Fasta (.fa) + Creating file associations... + + + + + + + + + + + + + Fasta File + fa + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-fasta+txt + + + Jalview-File.ico + + + + + + + + Fasta (.fasta) + Creating file associations... + + + + + + + + + + + + + Fasta File + fasta + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-fasta+txt + + + Jalview-File.ico + + + + + + + + Jalview Features (.features) + Creating file associations... + + + + + + + + + + + + + Jalview Features File + features + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-jalview-features+text + + + Jalview-File.ico + + + + + + + + Jalview Features (.jvfeatures) + Creating file associations... + + + + + + + + + + + + + Jalview Features File + jvfeatures + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-jalview-features+text + + + Jalview-File.ico + + + + + + + + Generic Features Format v2 (.gff2) + Creating file associations... + + + + + + + + + + + + + Generic Features Format v2 File + gff2 + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-gff2+txt + + + Jalview-File.ico + + + + + + + + Generic Features Format v3 (.gff3) + Creating file associations... + + + + + + + + + + + + + Generic Features Format v3 File + gff3 + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-gff3+txt + + + Jalview-File.ico + + + + + + + + JnetFile (.concise) + Creating file associations... + + + + + + + + + + + + + JnetFile File + concise + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-jalview-jnet+text + + + Jalview-File.ico + + + + + + + + JnetFile (.jnet) + Creating file associations... + + + + + + + + + + + + + JnetFile File + jnet + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-jalview-jnet+text + + + Jalview-File.ico + + + + + + + + mmCIF (.cif) + Creating file associations... + + + + + + + + + + + + + mmCIF File + cif + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + chemical/x-cif + + + Jalview-File.ico + + + + + + + + mmCIF (.mcif) + Creating file associations... + + + + + + + + + + + + + mmCIF File + mcif + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + chemical/x-mcif + + + Jalview-File.ico + + + + + + + + mmCIF (.mmcif) + Creating file associations... + + + + + + + + + + + + + mmCIF File + mmcif + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + chemical/x-mcif + + + Jalview-File.ico + + + + + + + + MSF (.msf) + Creating file associations... + + + + + + + + + + + + + MSF File + msf + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-msf+txt + + + Jalview-File.ico + + + + + + + + PDB (.pdb) + Creating file associations... + + + + + + + + + + + + + PDB File + pdb + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + chemical/x-pdb + + + Jalview-File.ico + + + + + + + + PDB (.ent) + Creating file associations... + + + + + + + + + + + + + PDB File + ent + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + chemical/x-pdb + + + Jalview-File.ico + + + + + + + + PFAM (.pfam) + Creating file associations... + + + + + + + + + + + + + PFAM File + pfam + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-pfam+txt + + + Jalview-File.ico + + + + + + + + PHYLIP (.phy) + Creating file associations... + + + + + + + + + + + + + PHYLIP File + phy + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-phylip+txt + + + Jalview-File.ico + + + + + + + + PileUp (.pileup) + Creating file associations... + + + + + + + + + + + + + PileUp File + pileup + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-pileup+txt + + + Jalview-File.ico + + + + + + + + PIR (.pir) + Creating file associations... + + + + + + + + + + + + + PIR File + pir + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-pir+txt + + + Jalview-File.ico + + + + + + + + RNAML (.rnaml) + Creating file associations... + + + + + + + + + + + + + RNAML File + rnaml + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/rnaml+xml + + + Jalview-File.ico + + + + + + + + Substitution Matrix (.mat) + Creating file associations... + + + + + + + + + + + + + Substitution Matrix File + mat + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-jalview-scorematrix+text + + + Jalview-File.ico + + + + + + + + Stockholm (.sto) + Creating file associations... + + + + + + + + + + + + + Stockholm File + sto + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-stockholm+txt + + + Jalview-File.ico + + + + + + + + Stockholm (.stk) + Creating file associations... + + + + + + + + + + + + + Stockholm File + stk + 737 + + + Jalview-File.icns + + + + + + + + + Jalview-File.png + + + application/x-stockholm+txt + + + Jalview-File.ico + + + + diff --git a/utils/install4j/file_associations_template-install4j8.xml b/utils/install4j/file_associations_template-install4j8.xml index ce5ebae..ee3aec8 100644 --- a/utils/install4j/file_associations_template-install4j8.xml +++ b/utils/install4j/file_associations_template-install4j8.xml @@ -1,22 +1,42 @@ - - - $$NAME$$ File - $$EXTENSION$$ - 737 - - - $$ICONFILE$$.icns - - - - - - - $$ICONFILE$$.ico - - - - + + + $$NAME$$ (.$$EXTENSION$$) + Creating file associations... + + + + + + + + + - + + + $$NAME$$ File + $$EXTENSION$$ + 737 + + + $$ICONFILE$$.icns + + + + + + + + + $$ICONFILE$$.png + + + $$MIMETYPE$$ + + + $$ICONFILE$$.ico + + + + diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j index e595d04..1d7c17f 100644 --- a/utils/install4j/install4j8_template.install4j +++ b/utils/install4j/install4j8_template.install4j @@ -363,6 +363,7 @@ return console.askOkCancel(message, true); + @@ -403,6 +404,28 @@ return console.askOkCancel(message, true); + + + + + Creating file associations... + + + + + + + + + + + + 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 + + + + @@ -469,12 +492,6 @@ return console.askOkCancel(message, true); 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 - - @@ -1095,7 +1112,7 @@ return console.askYesNo(message, true); - + @@ -1115,7 +1132,7 @@ return console.askYesNo(message, true); - +