JAL-4421 Put correct VolumeIcon.icns file onto DMG volume as /.VolumeIcon.icns

diff --git a/build.gradle b/build.gradle
index f8a6a20..ee883af 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -249,6 +249,7 @@ ext {
   install4jBuildDir = "${install4j_build_dir}/${JAVA_VERSION}"
   install4jDMGFixedDSStoreX64 = "build/macos_dmg/${install4j_dmg_ds_store}-x64"
   install4jDMGFixedDSStoreAarch64 = "build/macos_dmg/${install4j_dmg_ds_store}-aarch64"
+  install4jDMGVolumeIcon = string("${install4j_images_dir}/${install4j_dmg_volume_icon}")
   install4jCheckSums = true
 
   applicationName = "${jalview_name}"
@@ -2963,6 +2964,7 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) {
     'BACKGROUND': install4jBackground,
     'MACOSARCHIVE_X64_DMG_FILENAME': install4jmacOSArchiveX64DMGFilename,
     'MACOSARCHIVE_AARCH64_DMG_FILENAME': install4jmacOSArchiveAarch64DMGFilename,
+    'MACOSARCHIVE_VOLUMEICON': install4jDMGVolumeIcon,
   ]
 
   def varNameMap = [

diff --git a/gradle.properties b/gradle.properties
index 5906efd..e5b2f12 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -154,6 +154,7 @@ install4j_dmg_background = jalview_dmg_background-NON-RELEASE.png
 install4j_dmg_background_filename = background.png
 install4j_dmg_ds_store = jalview_dmg_DS_Store
 install4j_dmg_ds_store_json = jalview_dmg_DS_Store.json
+install4j_dmg_volume_icon = jalview-VolumeIcon.icns
 jalview_customise_ds_store = utils/macos_dmg/jalview_customise_dsstore.py
 
 

diff --git a/utils/channels/default/images/jalview_default-VolumeIcon.icns b/utils/channels/default/images/jalview_default-VolumeIcon.icns
new file mode 100644 (file)
index 0000000..f7cb7d9
Binary files /dev/null and b/utils/channels/default/images/jalview_default-VolumeIcon.icns differ

diff --git a/utils/channels/develop-SUFFIX/channel_gradle.properties b/utils/channels/develop-SUFFIX/channel_gradle.properties
index 0ba0373..31abcbd 100644 (file)
--- a/utils/channels/develop-SUFFIX/channel_gradle.properties
+++ b/utils/channels/develop-SUFFIX/channel_gradle.properties
@@ -30,6 +30,7 @@ install4j_png_icon_file = jalview_develop_logo.png
 install4j_background = jalview_develop_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_develop_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_develop_dmg_DS_Store
+install4j_dmg_volume_icon = jalview_develop-VolumeIcon.icns
 
 getdown_background_image_text_font = utils/fonts/Roboto.ttf
 getdown_background_image_text_colour = #b4b4b4

diff --git a/utils/channels/develop-SUFFIX/images/jalview_develop-VolumeIcon.icns b/utils/channels/develop-SUFFIX/images/jalview_develop-VolumeIcon.icns
new file mode 100644 (file)
index 0000000..0b39bda
Binary files /dev/null and b/utils/channels/develop-SUFFIX/images/jalview_develop-VolumeIcon.icns differ

diff --git a/utils/channels/develop/channel_gradle.properties b/utils/channels/develop/channel_gradle.properties
index 50d1d3c..b1d06d1 100644 (file)
--- a/utils/channels/develop/channel_gradle.properties
+++ b/utils/channels/develop/channel_gradle.properties
@@ -30,6 +30,7 @@ install4j_png_icon_file = jalview_develop_logo.png
 install4j_background = jalview_develop_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_develop_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_develop_dmg_DS_Store
+install4j_dmg_volume_icon = jalview_develop-VolumeIcon.icns
 
 getdown_background_image_text_font = utils/fonts/Roboto.ttf
 getdown_background_image_text_colour = #b4b4b4

diff --git a/utils/channels/release/channel_gradle.properties b/utils/channels/release/channel_gradle.properties
index 8d6c7ad..d5baac1 100644 (file)
--- a/utils/channels/release/channel_gradle.properties
+++ b/utils/channels/release/channel_gradle.properties
@@ -20,6 +20,7 @@ install4j_background = jalview_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_dmg_DS_Store
 install4j_dmg_ds_store_json = jalview_dmg_DS_Store.json
+install4j_dmg_volume_icon = jalview-VolumeIcon.icns
 
 getdown_background_image_text_font = utils/fonts/Roboto.ttf
 getdown_background_image_text_colour = #b4b4b4

diff --git a/utils/channels/test-release/channel_gradle.properties b/utils/channels/test-release/channel_gradle.properties
index 5b12b8d..a7d18cb 100644 (file)
--- a/utils/channels/test-release/channel_gradle.properties
+++ b/utils/channels/test-release/channel_gradle.properties
@@ -20,6 +20,7 @@ install4j_background = jalview_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_test-release_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_test-release_dmg_DS_Store
 install4j_dmg_ds_store_json = jalview_test-release_dmg_DS_Store.json
+install4j_dmg_volume_icon = jalview_test-release-VolumeIcon.icns
 
 getdown_background_image_text_font = utils/fonts/Roboto.ttf
 getdown_background_image_text_colour = #b4b4b4

diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j
index b118189..04e3cab 100644 (file)
--- a/utils/install4j/install4j10_template.install4j
+++ b/utils/install4j/install4j10_template.install4j
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="10.0.7" transformSequenceNumber="10">
+<install4j version="10.0.8" transformSequenceNumber="10">
   <directoryPresets config="bin/Jalview" />
   <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="${compiler:JAVA_MAX_VERSION}" allowBetaVM="true" jdkMode="jdk" jdkName="JDK 11.0">
     <searchSequence>
@@ -42,6 +42,7 @@
       <variable name="MACOS_DMG_DS_STORE" value="utils/channels/default/images/jalview_default_dmg_DS_Store" />
       <variable name="MACOS_DMG_BG_IMAGE" value="utils/channels/default/images/jalview_default_dmg_background-72dpi.png" />
       <variable name="MACOS_DMG_BG_FILENAME" value="background.png" />
+      <variable name="MACOSARCHIVE_VOLUMEICON" />
       <variable name="WRAPPER_LINK" value="jalview" />
       <variable name="BASH_WRAPPER_SCRIPT" value="jalview.sh" />
       <variable name="WRAPPER_SCRIPT_BIN_DIR" value="bin" />
@@ -1516,6 +1517,7 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch.</property>
         <symlink name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/MacOS/${compiler:WRAPPER_LINK}" target="../Resources/app/${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT}" />
         <symlink name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/app/jre/Contents/Home/bin/${compiler:JALVIEW_APPLICATION_NAME}" target="java" />
         <symlink name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/app/jre/Contents/Home/bin/${compiler:JALVIEW_NAME}" target="java" />
+        <file name=".VolumeIcon.icns" file="${compiler:JALVIEW_DIR}/${compiler:MACOSARCHIVE_VOLUMEICON}" />
       </topLevelFiles>
     </macosArchive>
     <macosArchive name="macOS (Apple Silicon) Disk Image" id="2796" customizedId="MACOS-AARCH64-DMG" mediaFileName="${compiler:MACOSARCHIVE_AARCH64_DMG_FILENAME}" volumeName="${compiler:MACOSARCHIVE_AARCH64_NAME}" architecture="aarch64" launcherId="737" setupAppId="2746">
@@ -1533,6 +1535,7 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch.</property>
         <symlink name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/MacOS/${compiler:WRAPPER_LINK}" target="../Resources/app/${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT}" />
         <symlink name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/app/jre/Contents/Home/bin/${compiler:JALVIEW_APPLICATION_NAME}" target="java" />
         <symlink name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/app/jre/Contents/Home/bin/${compiler:JALVIEW_NAME}" target="java" />
+        <file name=".VolumeIcon.icns" file="${compiler:JALVIEW_DIR}/${compiler:MACOSARCHIVE_VOLUMEICON}" />
       </topLevelFiles>
     </macosArchive>
     <unixInstaller name="Linux x64 Shell Installer" id="1595" customizedId="LINUX-X64-SH" mediaFileName="${compiler:UNIX_APPLICATION_FOLDER}-${compiler:JALVIEW_VERSION}-linux-x64-java_${compiler:JAVA_INTEGER_VERSION}" installDir="${compiler:UNIX_APPLICATION_FOLDER}" customInstallBaseDir="~/opt/">