From 725d33acf5eeca25549f438feba5c61c63b5ad31 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Tue, 25 Jun 2024 11:30:38 +0100 Subject: [PATCH] JAL-3631 Allow icon file name to be passed to launcher by install4j --- build.gradle | 10 ++++------ utils/install4j/install4j10_template.install4j | 23 ++++++++++++----------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 23c5447..9738981 100644 --- a/build.gradle +++ b/build.gradle @@ -242,9 +242,6 @@ ext { install4jmacOSArchiveName = "${jalview_name} Non-Release ${JALVIEW_VERSION} Installer" install4jExecutableName = install4j_executable_name install4jExtraScheme = "jalviewextra" - install4jMacIconsFile = string("${install4j_images_dir}/${install4j_mac_icons_file}") - install4jWindowsIconsFile = string("${install4j_images_dir}/${install4j_windows_icons_file}") - install4jPngIconFile = string("${install4j_images_dir}/${install4j_png_icon_file}") install4jBackground = string("${install4j_images_dir}/${install4j_background}") install4jBuildDir = "${install4j_build_dir}/${JAVA_VERSION}" install4jDMGFixedDSStoreX64 = "build/macos_dmg/${install4j_dmg_ds_store}-x64" @@ -3002,9 +2999,10 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) { 'UNIX_APPLICATION_FOLDER': install4jUnixApplicationFolder, 'EXECUTABLE_NAME': install4jExecutableName, 'EXTRA_SCHEME': install4jExtraScheme, - 'MAC_ICONS_FILE': install4jMacIconsFile, - 'WINDOWS_ICONS_FILE': install4jWindowsIconsFile, - 'PNG_ICON_FILE': install4jPngIconFile, + 'ICONS_DIR': install4j_images_dir, + 'MAC_ICONS_FILE': install4j_mac_icons_file, + 'WINDOWS_ICONS_FILE': install4j_windows_icons_file, + 'PNG_ICON_FILE': install4j_png_icon_file, 'BACKGROUND': install4jBackground, 'MACOSARCHIVE_X64_DMG_FILENAME': install4jmacOSArchiveX64DMGFilename, 'MACOSARCHIVE_AARCH64_DMG_FILENAME': install4jmacOSArchiveAarch64DMGFilename, diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j index f24478c..e20aca9 100644 --- a/utils/install4j/install4j10_template.install4j +++ b/utils/install4j/install4j10_template.install4j @@ -61,9 +61,10 @@ - - - + + + + @@ -137,8 +138,8 @@ - - + + @@ -147,7 +148,7 @@ - + @@ -170,7 +171,7 @@ ${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")} - + @@ -746,13 +747,13 @@ return console.askOkCancel(message, true); - ${compiler:JALVIEW_DIR}/${compiler:WINDOWS_ICONS_FILE} + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} ${compiler:JALVIEW_NAME} - ${compiler:JALVIEW_DIR}/${compiler:PNG_ICON_FILE} + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} @@ -772,12 +773,12 @@ return console.askOkCancel(message, true); ${compiler:JALVIEW_APPLICATION_NAME} - ${compiler:JALVIEW_DIR}/${compiler:PNG_ICON_FILE} + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE} - ${compiler:JALVIEW_DIR}/${compiler:WINDOWS_ICONS_FILE} + ${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE} -- 1.7.10.2