Merge branch 'develop' into spike/javier_noseqhack

[jalview.git] / gradle.properties

diff --git a/gradle.properties b/gradle.properties
index 3710b59..e4f0ebf 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,6 +34,10 @@ classes_dir = classes
 examplesDir = examples
 clover = false
 use_clover = false
+cloverReportJVMHeap = 2g
+cloverReportJVMArgs = -Dfile.encoding=UTF-8
+cloverReportHTMLOptions = 
+cloverReportXMLOptions =
 cloverClassesDir = clover-classes
 cloverSourcesInstrDir = sources-instr
 packageDir = dist
@@ -61,12 +65,14 @@ getdown_launcher = getdown-launcher.jar
 getdown_launcher_local = getdown-launcher-local.jar
 getdown_launcher_new = getdown-launcher-new.jar
 getdown_core = getdown/lib/getdown-core.jar
-getdown_launch_jvl = channel_launch.jvl
 getdown_build_properties = build_properties
-getdown_txt_title = Jalview
+getdown_launch_jvl_name = channel_launch
 getdown_txt_allow_offline = true
 getdown_txt_max_concurrent_downloads = 10
-getdown_txt_jalview.jvmmempc = 90
+# now got better defaults when not set
+#getdown_txt_jalview.jvmmempc = 90
+# now got better defaults when not set
+#getdown_txt_jalview.jvmmemmax = 32G
 getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR%
 getdown_txt_strict_comments = true
 getdown_txt_title = Jalview
@@ -89,21 +95,15 @@ getdown_txt_ui.progress_text = 000000
 getdown_txt_ui.status = 20, 380, 600, 58
 getdown_txt_ui.status_text = 000066
 #getdown_txt_ui.text_shadow = FFFFFF
-getdown_txt_ui.install_error = http://www.jalview.org/faq/getdownerror
+getdown_txt_ui.install_error = https://www.jalview.org/faq/getdownerror
 getdown_txt_ui.mac_dock_icon = resources/images/jalview_logos.ico
 getdown_alt_java8_min_version  = 01080000
 getdown_alt_java8_max_version  = 01089999
 getdown_alt_java11_min_version = 11000000
 getdown_alt_java11_max_version =
-getdown_alt_java11_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre11.jar,[linux-amd64] /getdown/jre/linux-jre11.tgz,[mac os x] /getdown/jre/macos-jre11.tgz
-getdown_alt_java8_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre1.8.tgz,[linux-amd64] /getdown/jre/linux-jre1.8.tgz,[mac os x] /getdown/jre/macos-jre1.8.tgz
-JRE_installs = /Users/bsoares/Java/installs
-Windows_JRE8 = OpenJDK8U-jdk_x64_windows_hotspot_8u202b08/jdk8u202-b08
-Mac_JRE8 = OpenJDK8U-jre_x64_mac_hotspot_8u202b08/jdk8u202-b08-jre/Contents/Home
-Linux_JRE8 = OpenJDK8U-jre_x64_linux_hotspot_8u202b08/jdk8u202-b08-jre
-Windows_JRE11 = OpenJDK11-jre_x64_windows_hotspot_11_28/jdk-11+28-jre
-Mac_JRE11 = OpenJDK11-jre_x64_mac_hotspot_11_28/jdk-11+28-jre/Contents/Home
-Linux_JRE11 = OpenJDK11-jre_x64_linux_hotspot_11_28/jdk-11+28-jre
+#getdown_alt_java11_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre11.jar,[linux-amd64] /getdown/jre/linux-jre11.tgz,[mac os x] /getdown/jre/macos-jre11.tgz
+#getdown_alt_java8_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre1.8.tgz,[linux-amd64] /getdown/jre/linux-jre1.8.tgz,[mac os x] /getdown/jre/macos-jre1.8.tgz
+jre_installs_dir = ~/buildtools/jre
 
 j8libDir = j8lib
 j11libDir = j11lib
@@ -114,13 +114,14 @@ install4j_home_dir = ~/buildtools/install4j8
 install4j_copyright_message = ...
 install4j_macOS_bundle_id = org.jalview.jalview-desktop
 install4j_utils_dir = utils/install4j
-install4j_template = install4j_template.install4j
+install4j_template = install4j8_template.install4j
 install4j_info_plist_file_associations = file_associations_auto-Info_plist.xml
-install4j_installer_file_associations = file_associations_auto-install4j.xml
+install4j_installer_file_associations = file_associations_auto-install4j8.xml
 #install4j_DMG_uninstaller_app_files = uninstall_old_jalview_files.xml
 install4j_build_dir = build/install4j
 install4j_media_types = windows,macosArchive,linuxRPM,linuxDeb,unixArchive,unixInstaller
 install4j_faster = false
+install4j_installer_name = Jalview Installer
 
 OSX_KEYSTORE =
 OSX_KEYPASS =
@@ -130,10 +131,10 @@ pandoc_exec = /usr/local/bin/pandoc,/usr/bin/pandoc
 dev = false
 
 CHANNEL=LOCAL
-getdown_channel_base = http://www.jalview.org/getdown
-getdown_channel_name = SCRATCH-DEFAULT
+getdown_channel_base = https://www.jalview.org/getdown
 getdown_app_dir_release = release
 getdown_app_dir_alt = alt
+getdown_app_dir_java = jre
 getdown_install_dir = install
 getdown_rsync_dest = /Volumes/jalview/docroot/getdown
 reportRsyncCommand =