JAL-3805 Remove Uninstall Old Jalview.app in Release_2_11_1_Branch

diff --git a/build.gradle b/build.gradle
index b2e9af1..80dcc4c 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ plugins {
   id 'application'
   id 'eclipse'
   id 'com.github.johnrengelman.shadow' version '4.0.3'
-  id 'com.install4j.gradle' version '8.0.4'
+  id 'com.install4j.gradle' version '8.0.10'
   id 'com.dorongold.task-tree' version '1.5' // only needed to display task dependency tree with  gradle task1 [task2 ...] taskTree
 }
 
@@ -1590,12 +1590,6 @@ task copyInstall4jTemplate {
       }
     }
 
-    // remove the "Uninstall Old Jalview (optional)" symlink from DMG for non-release DS_Stores
-    if (! (CHANNEL == "RELEASE" || CHANNEL == "TEST-RELEASE" ) ) {
-      def symlink = install4jConfigXml.'**'.topLevelFiles.symlink.find { sl -> sl.'@name' == "Uninstall Old Jalview (optional).app" }
-      symlink.parent().remove(symlink)
-    }
-
     // write install4j file
     install4jConfFile.text = XmlUtil.serialize(install4jConfigXml)
   }

diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist b/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist
deleted file mode 100644 (file)
index 649770d..0000000
--- a/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleAllowMixedLocalizations</key>
-       <true/>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>applet</string>
-       <key>CFBundleIconFile</key>
-       <string>applet</string>
-       <key>CFBundleIdentifier</key>
-       <string>com.apple.ScriptEditor.id.Uninstall-Old-Jalview</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>Uninstall Old Jalview</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleShortVersionString</key>
-       <string>1.0</string>
-       <key>CFBundleSignature</key>
-       <string>aplt</string>
-       <key>LSMinimumSystemVersionByArchitecture</key>
-       <dict>
-               <key>x86_64</key>
-               <string>10.6</string>
-       </dict>
-       <key>LSRequiresCarbon</key>
-       <true/>
-       <key>NSAppleEventsUsageDescription</key>
-       <string>This script needs to control other applications to run.</string>
-       <key>NSAppleMusicUsageDescription</key>
-       <string>This script needs access to your music to run.</string>
-       <key>NSCalendarsUsageDescription</key>
-       <string>This script needs access to your calendars to run.</string>
-       <key>NSCameraUsageDescription</key>
-       <string>This script needs access to your camera to run.</string>
-       <key>NSContactsUsageDescription</key>
-       <string>This script needs access to your contacts to run.</string>
-       <key>NSHomeKitUsageDescription</key>
-       <string>This script needs access to your HomeKit Home to run.</string>
-       <key>NSMicrophoneUsageDescription</key>
-       <string>This script needs access to your microphone to run.</string>
-       <key>NSPhotoLibraryUsageDescription</key>
-       <string>This script needs access to your photos to run.</string>
-       <key>NSRemindersUsageDescription</key>
-       <string>This script needs access to your reminders to run.</string>
-       <key>NSSiriUsageDescription</key>
-       <string>This script needs access to Siri to run.</string>
-       <key>NSSystemAdministrationUsageDescription</key>
-       <string>This script needs access to administer this system to run.</string>
-       <key>WindowState</key>
-       <dict>
-               <key>bundleDividerCollapsed</key>
-               <true/>
-               <key>bundlePositionOfDivider</key>
-               <real>0.0</real>
-               <key>dividerCollapsed</key>
-               <true/>
-               <key>eventLogLevel</key>
-               <integer>2</integer>
-               <key>name</key>
-               <string>ScriptWindowState</string>
-               <key>positionOfDivider</key>
-               <real>421</real>
-               <key>savedFrame</key>
-               <string>272 342 1754 910 0 0 3360 1867 </string>
-               <key>selectedTab</key>
-               <string>result</string>
-       </dict>
-</dict>
-</plist>

diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet b/utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet
deleted file mode 100755 (executable)
index 191894d..0000000
Binary files a/utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet and /dev/null differ

diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/PkgInfo b/utils/install4j/Uninstall Old Jalview.app/Contents/PkgInfo
deleted file mode 100644 (file)
index 3253614..0000000
--- a/utils/install4j/Uninstall Old Jalview.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPLaplt
\ No newline at end of file

diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt
deleted file mode 100644 (file)
index 3147d89..0000000
Binary files a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt and /dev/null differ

diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.icns b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.icns
deleted file mode 100644 (file)
index 67a2cbd..0000000
Binary files a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.icns and /dev/null differ

diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc
deleted file mode 100644 (file)
index 8e05928..0000000
Binary files a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc and /dev/null differ

diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf
deleted file mode 100644 (file)
index 5f23fc5..0000000
--- a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf
+++ /dev/null
@@ -1,5 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
-{\fonttbl}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;;}
-}
\ No newline at end of file

diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources b/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources
deleted file mode 100644 (file)
index 04a1485..0000000
--- a/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>files</key>
-       <dict>
-               <key>Resources/Scripts/main.scpt</key>
-               <data>
-               KEuZnZPFR5wgwG/qEhXMd5yBoi4=
-               </data>
-               <key>Resources/applet.icns</key>
-               <data>
-               vIRz6m6+ZxDNfi4iTsXj5rdcZUA=
-               </data>
-               <key>Resources/applet.rsrc</key>
-               <data>
-               oLbJze+WI6mK9fT14HFV6EwFoEI=
-               </data>
-               <key>Resources/description.rtfd/TXT.rtf</key>
-               <data>
-               JdCHmFsejhMRQNi2CzUAg7xM/6Q=
-               </data>
-       </dict>
-       <key>files2</key>
-       <dict>
-               <key>Resources/Scripts/main.scpt</key>
-               <dict>
-                       <key>hash</key>
-                       <data>
-                       KEuZnZPFR5wgwG/qEhXMd5yBoi4=
-                       </data>
-                       <key>hash2</key>
-                       <data>
-                       Y+OMztx129elZ3oX0uhaiMMNU87xhkEPVzSuhF528t0=
-                       </data>
-               </dict>
-               <key>Resources/applet.icns</key>
-               <dict>
-                       <key>hash</key>
-                       <data>
-                       vIRz6m6+ZxDNfi4iTsXj5rdcZUA=
-                       </data>
-                       <key>hash2</key>
-                       <data>
-                       D7gig1wJlOzR/Iy+y6TESLN0j/cIpjThUyO1pj5fZEc=
-                       </data>
-               </dict>
-               <key>Resources/applet.rsrc</key>
-               <dict>
-                       <key>hash</key>
-                       <data>
-                       oLbJze+WI6mK9fT14HFV6EwFoEI=
-                       </data>
-                       <key>hash2</key>
-                       <data>
-                       6bi/D/GzKmLhXbbC8+OLEX9+44Au0XOyGRd+kfw6uzA=
-                       </data>
-               </dict>
-               <key>Resources/description.rtfd/TXT.rtf</key>
-               <dict>
-                       <key>hash</key>
-                       <data>
-                       JdCHmFsejhMRQNi2CzUAg7xM/6Q=
-                       </data>
-                       <key>hash2</key>
-                       <data>
-                       e8RCmynIiyJGwHTnWQowZeGP0OUnjjA6SQTvIzP7Hxs=
-                       </data>
-               </dict>
-       </dict>
-       <key>rules</key>
-       <dict>
-               <key>^Resources/</key>
-               <true/>
-               <key>^Resources/.*\.lproj/</key>
-               <dict>
-                       <key>optional</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>1000</real>
-               </dict>
-               <key>^Resources/.*\.lproj/locversion.plist$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>1100</real>
-               </dict>
-               <key>^Resources/Base\.lproj/</key>
-               <dict>
-                       <key>weight</key>
-                       <real>1010</real>
-               </dict>
-               <key>^version.plist$</key>
-               <true/>
-       </dict>
-       <key>rules2</key>
-       <dict>
-               <key>.*\.dSYM($|/)</key>
-               <dict>
-                       <key>weight</key>
-                       <real>11</real>
-               </dict>
-               <key>^(.*/)?\.DS_Store$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>2000</real>
-               </dict>
-               <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-               <dict>
-                       <key>nested</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>10</real>
-               </dict>
-               <key>^.*</key>
-               <true/>
-               <key>^Info\.plist$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-               <key>^PkgInfo$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-               <key>^Resources/</key>
-               <dict>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-               <key>^Resources/.*\.lproj/</key>
-               <dict>
-                       <key>optional</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>1000</real>
-               </dict>
-               <key>^Resources/.*\.lproj/locversion.plist$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>1100</real>
-               </dict>
-               <key>^Resources/Base\.lproj/</key>
-               <dict>
-                       <key>weight</key>
-                       <real>1010</real>
-               </dict>
-               <key>^[^/]+$</key>
-               <dict>
-                       <key>nested</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>10</real>
-               </dict>
-               <key>^embedded\.provisionprofile$</key>
-               <dict>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-               <key>^version\.plist$</key>
-               <dict>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-       </dict>
-</dict>
-</plist>

diff --git a/utils/install4j/Uninstall Old Jalview.scpt b/utils/install4j/Uninstall Old Jalview.scpt
deleted file mode 100644 (file)
index 3ab3516..0000000
Binary files a/utils/install4j/Uninstall Old Jalview.scpt and /dev/null differ

diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index d540935..fbf7b7e 100644 (file)
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="8.0.5" transformSequenceNumber="8">
+<install4j version="8.0.8" transformSequenceNumber="8">
   <directoryPresets config="../.." />
   <application name="${compiler:JALVIEW_APPLICATION_NAME}" applicationId="${compiler:WINDOWS_APPLICATION_ID}" mediaDir="${compiler:BUILD_DIR}" lzmaCompression="true" shortName="${compiler:INTERNAL_ID}" publisher="University of Dundee" publisherWeb="https://www.jalview.org/" version="${compiler:JALVIEW_VERSION}" allPathsRelative="true" macVolumeId="5aac4968c304f65" javaMinVersion="${compiler:JAVA_MIN_VERSION}" javaMaxVersion="9999999999${compiler:JAVA_MAX_VERSION}" allowBetaVM="true" jdkMode="jdk" jdkName="JDK 11.0">
     <searchSequence>
@@ -57,14 +57,12 @@
       <fileset name="Mac OS X JRE" id="880" />
       <fileset name="Windows JRE" id="882" />
       <fileset name="Jalview application" id="1873" />
-      <fileset name="MacOS Old Jalview Uninstaller" id="2105" />
     </filesets>
     <roots>
       <root id="735" fileset="734" />
       <root id="881" fileset="880" />
       <root id="883" fileset="882" />
       <root id="1874" fileset="1873" />
-      <root id="2106" fileset="2105" />
     </roots>
     <mountPoints>
       <mountPoint id="454" />
@@ -72,7 +70,6 @@
       <mountPoint id="884" root="881" />
       <mountPoint id="885" root="883" />
       <mountPoint id="1875" root="1874" />
-      <mountPoint id="2107" root="2106" />
     </mountPoints>
     <entries>
       <dirEntry mountPoint="454" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_FILES_DIR}/${compiler:JAVA_VERSION}" uninstallMode="2" overrideOverwriteMode="true" overrideUninstallMode="true" subDirectory="files" />
@@ -81,7 +78,6 @@
       <dirEntry mountPoint="884" file="${compiler:MACOS_JAVA_VM_DIR}" fileMode="755" overrideFileMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:JRE_DIR}" />
       <dirEntry mountPoint="885" file="${compiler:WINDOWS_JAVA_VM_DIR}" fileMode="755" overrideFileMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:JRE_DIR}" />
       <dirEntry mountPoint="1875" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/${compiler:GETDOWN_DIST_DIR}" overwriteMode="1" uninstallMode="2" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:GETDOWN_DIST_DIR}" overrideDirMode="true" />
-      <dirEntry mountPoint="2107" file="Uninstall Old Jalview.app" fileMode="755" overrideFileMode="true" entryMode="subdir" subDirectory="Uninstall Old Jalview.app" overrideDirMode="true" />
     </entries>
     <components>
       <component name="jalview_getdown" id="1031">
@@ -109,11 +105,6 @@
           <entry filesetId="1873" />
         </include>
       </component>
-      <component name="macos_old_jalview_uninstaller" id="2110">
-        <include>
-          <entry filesetId="2105" />
-        </include>
-      </component>
     </components>
   </files>
   <launchers>
@@ -1130,7 +1121,6 @@ return console.askYesNo(message, true);
         <component id="1156" />
         <component id="1276" />
         <component id="1881" />
-        <component id="2110" />
       </excludedComponents>
       <exclude>
         <entry defaultFileset="true" />
@@ -1158,7 +1148,6 @@ return console.askYesNo(message, true);
         <file name=".DS_Store" file="${compiler:JALVIEW_DIR}/${compiler:INSTALL4J_UTILS_DIR}/${compiler:MACOS_DS_STORE}" />
         <file name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/Jalview-File.icns" file="${compiler:JALVIEW_DIR}/${compiler:INSTALL4J_UTILS_DIR}/Jalview-File.icns" />
         <file name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/Jalview-Launch.icns" file="${compiler:JALVIEW_DIR}/${compiler:INSTALL4J_UTILS_DIR}/Jalview-Launch.icns" />
-        <symlink name="Uninstall Old Jalview (optional).app" target="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/app/Uninstall Old Jalview.app" />
       </topLevelFiles>
     </macosArchive>
     <unixInstaller name="Linux x64 Shell Installer" id="1595" mediaFileName="${compiler:UNIX_APPLICATION_FOLDER}-${compiler:JALVIEW_VERSION}-linux_x64-java_${compiler:JAVA_INTEGER_VERSION}" installDir="${compiler:UNIX_APPLICATION_FOLDER}" customInstallBaseDir="~/opt/">
@@ -1167,7 +1156,6 @@ return console.askYesNo(message, true);
         <component id="1156" />
         <component id="1276" />
         <component id="1881" />
-        <component id="2110" />
       </excludedComponents>
       <exclude>
         <entry defaultFileset="true" />
@@ -1184,7 +1172,6 @@ return console.askYesNo(message, true);
         <component id="1156" />
         <component id="1276" />
         <component id="1881" />
-        <component id="2110" />
       </excludedComponents>
       <exclude>
         <entry defaultFileset="true" />
@@ -1201,7 +1188,6 @@ return console.askYesNo(message, true);
         <component id="1156" />
         <component id="1276" />
         <component id="1881" />
-        <component id="2110" />
       </excludedComponents>
       <exclude>
         <entry defaultFileset="true" />