X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=012d61ea2d9b4156cc8220d58d0827a1a5b2ed7f;hb=fe88522a1771e72d1e21f81764b823a1f708cc1f;hp=210a83c86e237e164a685ec88ec839a360b6e08f;hpb=ee0377aad94f5fc18281821bfbdd7c45aabbeeff;p=jalview.git diff --git a/build.gradle b/build.gradle index 210a83c..012d61e 100644 --- a/build.gradle +++ b/build.gradle @@ -238,7 +238,7 @@ ext { install4jDMGBackgroundImageFile = "${install4j_dmg_background}" install4jInstallerName = "${jalview_name} Non-Release Installer" install4jExecutableName = install4j_executable_name - install4jExtraScheme = "jalviewx" + 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}") @@ -269,6 +269,7 @@ ext { reportRsyncCommand = true install4jSuffix = "" install4jInstallerName = "${jalview_name} Installer" + install4jExtraScheme = (CHANNEL=="RELEASE")?"jalviewx":"jalviewjs" break case "ARCHIVE": @@ -1769,7 +1770,7 @@ task testTask0(type: Test) { preserveOrder true useDefaultListeners=true } - timeout = Duration.ofMinutes(1) + timeout = Duration.ofMinutes(15) } /* separated tests */ @@ -2608,6 +2609,14 @@ task getdownArchiveBuild() { } } + // the wrapper scripts dir + if ( file("${getdownAppBaseDir}/${getdown_wrapper_script_dir}").exists() ) { + copy { + from "${getdownAppBaseDir}/${getdown_wrapper_script_dir}" + into "${getdownFullArchiveDir}/${getdown_wrapper_script_dir}" + } + } + getdownArchiveTxt.write(getdownArchiveTextLines.join("\n")) def vLaunchJvl = file(getdownVersionLaunchJvl) @@ -2834,6 +2843,9 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) { projectFile = install4jConfFile + // run install4j with 4g + vmParameters = ["-Xmx4294967296"] + // create an md5 for the input files to use as version for install4j conf file def digest = MessageDigest.getInstance("MD5") digest.update(