From 63e1d6a7a87f084e3950d8cf6c535c0c62eaf3ee Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Fri, 14 Jun 2024 18:51:40 +0100 Subject: [PATCH] JAL-3631 Got rid of the USER_EXECUTABLE_NAME as it's no longer needed since getting rid of the old Launcher in install4j --- build.gradle | 2 -- gradle.properties | 1 - utils/install4j/install4j10_template.install4j | 3 +-- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 18276a2..b02e511 100644 --- a/build.gradle +++ b/build.gradle @@ -241,7 +241,6 @@ ext { install4jDMGBackgroundImageFile = "${install4j_dmg_background}" install4jmacOSArchiveName = "${jalview_name} Non-Release ${JALVIEW_VERSION} Installer" install4jExecutableName = install4j_executable_name - install4jUserExecutableName = install4j_user_executable_name install4jExtraScheme = "jalviewextra" install4jMacIconsFile = string("${install4j_images_dir}/${install4j_mac_icons_file}") install4jWindowsIconsFile = string("${install4j_images_dir}/${install4j_windows_icons_file}") @@ -2993,7 +2992,6 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) { 'APPLICATION_FOLDER': install4jApplicationFolder, 'UNIX_APPLICATION_FOLDER': install4jUnixApplicationFolder, 'EXECUTABLE_NAME': install4jExecutableName, - 'USER_EXECUTABLE_NAME': install4jUserExecutableName, 'EXTRA_SCHEME': install4jExtraScheme, 'MAC_ICONS_FILE': install4jMacIconsFile, 'WINDOWS_ICONS_FILE': install4jWindowsIconsFile, diff --git a/gradle.properties b/gradle.properties index 5183062..9100238 100644 --- a/gradle.properties +++ b/gradle.properties @@ -142,7 +142,6 @@ install4j_installer_file_associations = file_associations_auto-install4j10.xml #install4j_DMG_uninstaller_app_files = uninstall_old_jalview_files.xml install4j_build_dir = build/install4j install4j_executable_name = jalviewg -install4j_user_executable_name = jalviewu #install4j_media_types = windows,macosArchive,unixArchive,unixInstaller #install4j_build_ids = WINDOWS-X64-EXE,MACOS-X64-DMG,MACOS-AARCH64-DMG,LINUX-X64-SH,LINUX-AARCH-SH,UNIX--SH,UNIX--TGZ install4j_faster = false diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j index 85e9326..44421c2 100644 --- a/utils/install4j/install4j10_template.install4j +++ b/utils/install4j/install4j10_template.install4j @@ -60,7 +60,6 @@ - @@ -139,7 +138,7 @@ - + -- 1.7.10.2