From: Ben Soares Date: Wed, 12 Jun 2024 22:18:43 +0000 (+0100) Subject: JAL-3631 Add a new launcher in install4j to pass new system properties to getdown... X-Git-Tag: Release_2_11_4_0~24^2~44 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=72e0c69f1cf47fd8422b80470e7e60e508d67e40;p=jalview.git JAL-3631 Add a new launcher in install4j to pass new system properties to getdown, triggering the user-space appdir creation --- diff --git a/build.gradle b/build.gradle index d057994..7a14a67 100644 --- a/build.gradle +++ b/build.gradle @@ -241,6 +241,7 @@ 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}") @@ -2280,6 +2281,7 @@ task getdownWebsiteBuild() { } def getdownWebsiteResourceFilenames = [] + def getdownWebsitePResourceFilenames = [] def getdownResourceDir = getdownResourceDir def getdownResourceFilenames = [] @@ -2354,7 +2356,11 @@ task getdownWebsiteBuild() { } if (r.exists()) { val = "${getdown_resource_dir}/" + r.getName() - getdownWebsiteResourceFilenames += val + if (prop.startsWith("getdown_txt_ui.")) { + getdownWebsitePResourceFilenames += val + } else { + getdownWebsiteResourceFilenames += val + } getdownResourceFilenames += r.getPath() } } @@ -2366,6 +2372,9 @@ task getdownWebsiteBuild() { } } + getdownWebsitePResourceFilenames.each{ filename -> + getdownTextLines += "presource = ${filename}" + } getdownWebsiteResourceFilenames.each{ filename -> getdownTextLines += "resource = ${filename}" } @@ -2986,6 +2995,7 @@ 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 e5b2f12..8891190 100644 --- a/gradle.properties +++ b/gradle.properties @@ -142,6 +142,7 @@ 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_faster = false install4j_application_categories = Science;Biology;Java; diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j index 04e3cab..3a33039 100644 --- a/utils/install4j/install4j10_template.install4j +++ b/utils/install4j/install4j10_template.install4j @@ -60,6 +60,7 @@ + @@ -144,7 +145,7 @@ - + @@ -166,6 +167,38 @@ + + + + + + + + + + + + + + + + + + + + + ${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")} + + + + + + + + + + + @@ -1492,6 +1525,9 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. + + + @@ -1502,7 +1538,7 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. - + @@ -1520,7 +1556,7 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. - + @@ -1539,6 +1575,9 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. + + + @@ -1554,6 +1593,9 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. + + + @@ -1569,6 +1611,9 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. + + + @@ -1580,6 +1625,9 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. + + +