Index: build.gradle =================================================================== diff -u -N -rdd81c1942eeeeb0a524488c9930f5082bbdf9003 -r4e77b06eaad21132a66cdcaf7b13341ebad620aa --- build.gradle (.../build.gradle) (revision dd81c1942eeeeb0a524488c9930f5082bbdf9003) +++ build.gradle (.../build.gradle) (revision 4e77b06eaad21132a66cdcaf7b13341ebad620aa) @@ -40,7 +40,7 @@ id 'eclipse' id "com.diffplug.gradle.spotless" version "3.28.0" 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 id 'com.palantir.git-version' version '0.12.3' } @@ -1837,12 +1837,6 @@ } } - // 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) } Index: utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist =================================================================== diff -u -N --- utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist (revision 862f3e6bae01460b08acfd9b1d9d1a54e76be731) +++ utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist (revision 0) @@ -1,74 +0,0 @@ - - - - - CFBundleAllowMixedLocalizations - - CFBundleDevelopmentRegion - English - CFBundleExecutable - applet - CFBundleIconFile - applet - CFBundleIdentifier - com.apple.ScriptEditor.id.Uninstall-Old-Jalview - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Uninstall Old Jalview - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - aplt - LSMinimumSystemVersionByArchitecture - - x86_64 - 10.6 - - LSRequiresCarbon - - NSAppleEventsUsageDescription - This script needs to control other applications to run. - NSAppleMusicUsageDescription - This script needs access to your music to run. - NSCalendarsUsageDescription - This script needs access to your calendars to run. - NSCameraUsageDescription - This script needs access to your camera to run. - NSContactsUsageDescription - This script needs access to your contacts to run. - NSHomeKitUsageDescription - This script needs access to your HomeKit Home to run. - NSMicrophoneUsageDescription - This script needs access to your microphone to run. - NSPhotoLibraryUsageDescription - This script needs access to your photos to run. - NSRemindersUsageDescription - This script needs access to your reminders to run. - NSSiriUsageDescription - This script needs access to Siri to run. - NSSystemAdministrationUsageDescription - This script needs access to administer this system to run. - WindowState - - bundleDividerCollapsed - - bundlePositionOfDivider - 0.0 - dividerCollapsed - - eventLogLevel - 2 - name - ScriptWindowState - positionOfDivider - 421 - savedFrame - 272 342 1754 910 0 0 3360 1867 - selectedTab - result - - - Index: utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet =================================================================== diff -u -N -r1b850d6677bce4ef246d087b7327521c249348c7 -r4e77b06eaad21132a66cdcaf7b13341ebad620aa Binary files differ Index: utils/install4j/Uninstall Old Jalview.app/Contents/PkgInfo =================================================================== diff -u -N --- utils/install4j/Uninstall Old Jalview.app/Contents/PkgInfo (revision 90cdc6b3f35ec9f98121a0e9c74e9ca4f7923cd3) +++ utils/install4j/Uninstall Old Jalview.app/Contents/PkgInfo (revision 0) @@ -1 +0,0 @@ -APPLaplt \ No newline at end of file Index: utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt =================================================================== diff -u -N -r862f3e6bae01460b08acfd9b1d9d1a54e76be731 -r4e77b06eaad21132a66cdcaf7b13341ebad620aa Binary files differ Index: utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.icns =================================================================== diff -u -N -r90cdc6b3f35ec9f98121a0e9c74e9ca4f7923cd3 -r4e77b06eaad21132a66cdcaf7b13341ebad620aa Binary files differ Index: utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc =================================================================== diff -u -N -r862f3e6bae01460b08acfd9b1d9d1a54e76be731 -r4e77b06eaad21132a66cdcaf7b13341ebad620aa Binary files differ Index: utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf =================================================================== diff -u -N --- utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf (revision 862f3e6bae01460b08acfd9b1d9d1a54e76be731) +++ utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf (revision 0) @@ -1,5 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500 -{\fonttbl} -{\colortbl;\red255\green255\blue255;} -{\*\expandedcolortbl;;} -} \ No newline at end of file Index: utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources =================================================================== diff -u -N --- utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources (revision 1b850d6677bce4ef246d087b7327521c249348c7) +++ utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources (revision 0) @@ -1,177 +0,0 @@ - - - - - files - - Resources/Scripts/main.scpt - - KEuZnZPFR5wgwG/qEhXMd5yBoi4= - - Resources/applet.icns - - vIRz6m6+ZxDNfi4iTsXj5rdcZUA= - - Resources/applet.rsrc - - oLbJze+WI6mK9fT14HFV6EwFoEI= - - Resources/description.rtfd/TXT.rtf - - JdCHmFsejhMRQNi2CzUAg7xM/6Q= - - - files2 - - Resources/Scripts/main.scpt - - hash - - KEuZnZPFR5wgwG/qEhXMd5yBoi4= - - hash2 - - Y+OMztx129elZ3oX0uhaiMMNU87xhkEPVzSuhF528t0= - - - Resources/applet.icns - - hash - - vIRz6m6+ZxDNfi4iTsXj5rdcZUA= - - hash2 - - D7gig1wJlOzR/Iy+y6TESLN0j/cIpjThUyO1pj5fZEc= - - - Resources/applet.rsrc - - hash - - oLbJze+WI6mK9fT14HFV6EwFoEI= - - hash2 - - 6bi/D/GzKmLhXbbC8+OLEX9+44Au0XOyGRd+kfw6uzA= - - - Resources/description.rtfd/TXT.rtf - - hash - - JdCHmFsejhMRQNi2CzUAg7xM/6Q= - - hash2 - - e8RCmynIiyJGwHTnWQowZeGP0OUnjjA6SQTvIzP7Hxs= - - - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - Index: utils/install4j/Uninstall Old Jalview.scpt =================================================================== diff -u -N -r862f3e6bae01460b08acfd9b1d9d1a54e76be731 -r4e77b06eaad21132a66cdcaf7b13341ebad620aa Binary files differ Index: utils/install4j/install4j8_template.install4j =================================================================== diff -u -N -r8d55494f762adc45e799ea38ebb33ec2e3f73b10 -r4e77b06eaad21132a66cdcaf7b13341ebad620aa --- utils/install4j/install4j8_template.install4j (.../install4j8_template.install4j) (revision 8d55494f762adc45e799ea38ebb33ec2e3f73b10) +++ utils/install4j/install4j8_template.install4j (.../install4j8_template.install4j) (revision 4e77b06eaad21132a66cdcaf7b13341ebad620aa) @@ -1,5 +1,5 @@ - + @@ -61,22 +61,19 @@ - - - @@ -85,7 +82,6 @@ - @@ -113,11 +109,6 @@ - - - - - @@ -1134,7 +1125,6 @@ - @@ -1162,7 +1152,6 @@ - @@ -1171,7 +1160,6 @@ - @@ -1188,7 +1176,6 @@ - @@ -1205,7 +1192,6 @@ -