JAL-3594 DMG fixes

diff --git a/build.gradle b/build.gradle
index 5ed88d1..71dae0f 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -98,7 +98,7 @@ ext {
 
   getdownChannelName = CHANNEL.toLowerCase()
   // default to "default". Currently only has different cosmetics for "develop", "release", "default"
-  propertiesChannelName = ["develop", "release"].contains(getdownChannelName) ? getdownChannelName : "default"
+  propertiesChannelName = ["develop", "release", "test-release"].contains(getdownChannelName) ? getdownChannelName : "default"
   // Import channel_properties
   channelDir = string("${jalviewDir}/${channel_properties_dir}/${propertiesChannelName}")
   channelGradleProperties = string("${channelDir}/channel_gradle.properties")
@@ -1870,7 +1870,7 @@ task installers(type: com.install4j.gradle.Install4jTask) {
     'BUNDLE_ID': install4jBundleId,
     'INTERNAL_ID': install4jInternalId,
     'WINDOWS_APPLICATION_ID': install4jWinApplicationId,
-    'MACOS_DS_STORE': install4jDMGDSStore,
+    'MACOS_DMG_DS_STORE': install4jDMGDSStore,
     'MACOS_DMG_BG_IMAGE': install4jDMGBackgroundImage,
     'INSTALLER_NAME': install4jInstallerName,
     'INSTALL4J_UTILS_DIR': install4j_utils_dir,

diff --git a/utils/channels/default/channel_gradle.properties b/utils/channels/default/channel_gradle.properties
index 50b52ab..a83ee8b 100644 (file)
--- a/utils/channels/default/channel_gradle.properties
+++ b/utils/channels/default/channel_gradle.properties
@@ -12,11 +12,11 @@ getdown_txt_allow_offline = true
 getdown_txt_max_concurrent_downloads = 10
 getdown_txt_ui.install_error = https://www.jalview.org/faq/getdownerror
 getdown_txt_ui.hide_decorations = true
-install4j_images_dir = utils/channels/release/images
+install4j_images_dir = utils/channels/default/images
 install4j_mac_icons_file = jalview_logo.icns
 install4j_windows_icons_file = jalview_logo.ico
 install4j_png_icon_file = jalview_logo.png
 install4j_background = jalview_logo_background_fade-640x480.png
-install4j_dmg_background = jalview_default_dmg_background.png
+install4j_dmg_background = jalview_default_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_default_dmg_DS_Store
 

diff --git a/utils/channels/default/images/jalview_default_dmg_DS_Store b/utils/channels/default/images/jalview_default_dmg_DS_Store
index 0d67d11..f58e9ec 100644 (file)
Binary files a/utils/channels/default/images/jalview_default_dmg_DS_Store and b/utils/channels/default/images/jalview_default_dmg_DS_Store differ

diff --git a/utils/channels/default/images/jalview_default_dmg_background-72dpi.png b/utils/channels/default/images/jalview_default_dmg_background-72dpi.png
new file mode 100644 (file)
index 0000000..89c6a04
Binary files /dev/null and b/utils/channels/default/images/jalview_default_dmg_background-72dpi.png differ

diff --git a/utils/channels/default/images/jalview_default_dmg_background.png b/utils/channels/default/images/jalview_default_dmg_background.png
index 94aedaf..c037857 100644 (file)
Binary files a/utils/channels/default/images/jalview_default_dmg_background.png and b/utils/channels/default/images/jalview_default_dmg_background.png differ

diff --git a/utils/channels/develop/channel_gradle.properties b/utils/channels/develop/channel_gradle.properties
index 3664690..8917c6c 100644 (file)
--- a/utils/channels/develop/channel_gradle.properties
+++ b/utils/channels/develop/channel_gradle.properties
@@ -28,5 +28,5 @@ install4j_mac_icons_file = jalview_develop_logo.icns
 install4j_windows_icons_file = jalview_develop_logo.ico
 install4j_png_icon_file = jalview_develop_logo.png
 install4j_background = jalview_develop_logo_background_fade-640x480.png
-install4j_dmg_background = jalview_delvelop_dmg_background.png
+install4j_dmg_background = jalview_develop_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_develop_dmg_DS_Store

diff --git a/utils/channels/develop/images/jalview_develop_dmg_DS_Store b/utils/channels/develop/images/jalview_develop_dmg_DS_Store
index a65165c..4d439ee 100644 (file)
Binary files a/utils/channels/develop/images/jalview_develop_dmg_DS_Store and b/utils/channels/develop/images/jalview_develop_dmg_DS_Store differ

diff --git a/utils/channels/develop/images/jalview_develop_dmg_background-72dpi.png b/utils/channels/develop/images/jalview_develop_dmg_background-72dpi.png
new file mode 100644 (file)
index 0000000..de7f6df
Binary files /dev/null and b/utils/channels/develop/images/jalview_develop_dmg_background-72dpi.png differ

diff --git a/utils/channels/develop/images/jalview_develop_dmg_background.png b/utils/channels/develop/images/jalview_develop_dmg_background.png
index 0acb5ee..aa8e3c5 100644 (file)
Binary files a/utils/channels/develop/images/jalview_develop_dmg_background.png and b/utils/channels/develop/images/jalview_develop_dmg_background.png differ

diff --git a/utils/channels/release/channel_gradle.properties b/utils/channels/release/channel_gradle.properties
index 33e12f4..382732e 100644 (file)
--- a/utils/channels/release/channel_gradle.properties
+++ b/utils/channels/release/channel_gradle.properties
@@ -17,6 +17,6 @@ install4j_mac_icons_file = jalview_logo.icns
 install4j_windows_icons_file = jalview_logo.ico
 install4j_png_icon_file = jalview_logo.png
 install4j_background = jalview_logo_background_fade-640x480.png
-install4j_dmg_background = jalview_dmg_background.png
+install4j_dmg_background = jalview_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_dmg_DS_Store
 

diff --git a/utils/channels/release/images/jalview_dmg_DS_Store b/utils/channels/release/images/jalview_dmg_DS_Store
index cada68d..75cd04d 100644 (file)
Binary files a/utils/channels/release/images/jalview_dmg_DS_Store and b/utils/channels/release/images/jalview_dmg_DS_Store differ

diff --git a/utils/channels/release/images/jalview_dmg_background-72dpi.png b/utils/channels/release/images/jalview_dmg_background-72dpi.png
new file mode 100644 (file)
index 0000000..728d710
Binary files /dev/null and b/utils/channels/release/images/jalview_dmg_background-72dpi.png differ

diff --git a/utils/channels/test-release/channel_gradle.properties b/utils/channels/test-release/channel_gradle.properties
index bb6909a..cd9bf74 100644 (file)
--- a/utils/channels/test-release/channel_gradle.properties
+++ b/utils/channels/test-release/channel_gradle.properties
@@ -12,11 +12,11 @@ getdown_txt_allow_offline = true
 getdown_txt_max_concurrent_downloads = 10
 getdown_txt_ui.install_error = https://www.jalview.org/faq/getdownerror
 getdown_txt_ui.hide_decorations = true
-install4j_images_dir = utils/channels/release/images
+install4j_images_dir = utils/channels/test-release/images
 install4j_mac_icons_file = jalview_logo.icns
 install4j_windows_icons_file = jalview_logo.ico
 install4j_png_icon_file = jalview_logo.png
 install4j_background = jalview_logo_background_fade-640x480.png
-install4j_dmg_background = jalview_test-release_dmg_background.png
+install4j_dmg_background = jalview_test-release_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_test-release_dmg_DS_Store
 

diff --git a/utils/channels/test-release/images/jalview_test-release_dmg_DS_Store b/utils/channels/test-release/images/jalview_test-release_dmg_DS_Store
index 164c584..1603317 100644 (file)
Binary files a/utils/channels/test-release/images/jalview_test-release_dmg_DS_Store and b/utils/channels/test-release/images/jalview_test-release_dmg_DS_Store differ

diff --git a/utils/channels/test-release/images/jalview_test-release_dmg_background-72dpi.png b/utils/channels/test-release/images/jalview_test-release_dmg_background-72dpi.png
new file mode 100644 (file)
index 0000000..54aa28a
Binary files /dev/null and b/utils/channels/test-release/images/jalview_test-release_dmg_background-72dpi.png differ

diff --git a/utils/install4j/README-DMG_background_image_creation.md b/utils/install4j/README-DMG_background_image_creation.md
index c233852..0872e4c 100644 (file)
--- a/utils/install4j/README-DMG_background_image_creation.md
+++ b/utils/install4j/README-DMG_background_image_creation.md
@@ -1,12 +1,12 @@
 # Links with `DS_Store`
-The DMG background image should be 500x461 pixels with DPI set at 72.  The spacing for the Jalview application icon and the symbolic link to the Applications folder tie in with the information in the `DS_Store` file, so both files should be changed if you want to move the icons.  Instructions on how to create/adapt the `DS_Store` file can be found in file `DMG_creation_README.md`.
+The DMG background image should be 500x461 pixels with DPI set at 72.  The spacing for the Jalview application icon and the symbolic link to the Applications folder tie in with the information in the `DS_Store` file, so both files should be changed if you want to move the icons.  Instructions on how to create/adapt the `DS_Store` file can be found in file `README-DMG_creation.md`.
 
 # Creation of `jalview_dmg_background.png`
 The most recent `jalview_dmg_background.png` (with blurry faded tiled Jalview logos, should be released with Jalview 2.11.1) is created from the `jalview_dmg_background_blur_layers.svg` file which can be edited in Inkscape.  It is exported as `jalview_dmg_background_blur.png` at 500x461 pixels but Inkscape currently makes it difficult to choose an arbitrary dpi in the PNG metadata, with 96 DPI the default.
 
 The exported PNG can have the 96 DPI metadata changed using GIMP or ImageMagick.  Here is how to do it on the command line with ImageMagick:
 ```
-convert -units PixelsPerInch jalview_dmg_background_blur.png -density 72 jalview_dmg_background_blur_72dpi.png
+convert -units PixelsPerInch jalview_dmg_background_blur.png -density 72 jalview_dmg_background.png
 ```
 The final image should be saved as `jalview_dmg_background.png` (which the above `convert` command will do) as this is the filename set in the `install4j8_template.install4j` file to include in the final DMG.
 

diff --git a/utils/install4j/README-DMG_creation.md b/utils/install4j/README-DMG_creation.md
index e6511c9..1c4d579 100644 (file)
--- a/utils/install4j/README-DMG_creation.md
+++ b/utils/install4j/README-DMG_creation.md
@@ -35,4 +35,4 @@ umount /Volumes/Jalview\ Installer
 
 ## Background image
 
-See file `DMG_background_image_creation_README.md` on how to create the background image.
+See file `README-DMG_background_image_creation.md` on how to create the background image.