X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=gradle.properties;h=59699e3e1f85fa6c2948e5349f5e2570d82cb14e;hb=refs%2Fheads%2Ffeature%2FJAL-3624siftsInJS;hp=24b90c2cc167db5594bfacbe1bea8ca0d226cbb9;hpb=18f5de004a86e5b768a8b50a9a59c2705e766d15;p=jalview.git

diff --git a/gradle.properties b/gradle.properties
index 24b90c2..59699e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,6 @@
+org.gradle.jvmargs=-Xmx1536m -Xms512m -Dfile.encoding=UTF-8
+#systemProp.file.encoding=UTF-8
+
 jalviewDir = .
 
 #JAVA_VERSION = 1.8
@@ -22,6 +25,7 @@ jalview_keyalg = SHA1withRSA
 jalview_keydig = SHA1
 
 testngGroups = Functional
+testngExcludedGroups = 
 
 j8libDir = j8lib
 j11libDir = j11lib
@@ -34,6 +38,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
@@ -49,7 +57,7 @@ mainClass = jalview.bin.Jalview
 shadowJarMainClass = jalview.bin.Launcher
 launcherClass = jalview.bin.Jalview
 
-gradlePluginsDir = gradle/plugins
+jalview_name = Jalview
 
 getdown_local = false
 getdown_website_dir = getdown/website
@@ -61,16 +69,16 @@ 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
-getdown_txt_ui.name = Jalview
 getdown_txt_ui.progress_sync_before_shown = true
 getdown_txt_ui.progress_sync_after_shown = false
 getdown_txt_ui.keep_on_top = true
@@ -89,37 +97,34 @@ 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
 j11modDir = j11mod
 j11modules = com.sun.istack.runtime,com.sun.xml.bind,com.sun.xml.fastinfoset,com.sun.xml.streambuffer,com.sun.xml.txw2,com.sun.xml.ws.policy,java.activation,java.annotation,java.base,java.compiler,java.datatransfer,java.desktop,java.logging,java.management,java.management.rmi,java.naming,java.prefs,java.rmi,java.scripting,java.security.sasl,java.sql,java.xml,java.xml.bind,java.xml.soap,java.xml.ws,javax.jws,jdk.httpserver,jdk.jsobject,jdk.unsupported,jdk.xml.dom,org.jvnet.mimepull,org.jvnet.staxex,javax.servlet.api,java.ws.rs
 
-install4jCopyrightMessage = ...
-install4jMacOSBundleId = org.jalview.jalview-desktop
-install4jResourceDir = utils/install4j
-install4jTemplate = install4j_template.install4j
-install4jInfoPlistFileAssociations = file_associations_auto-Info_plist.xml
-install4jInstallerFileAssociations = file_associations_auto-install4j.xml
-install4jDMGUninstallerAppFiles = uninstall_old_jalview_files.xml
-install4jBuildDir = build/install4j
-install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb,unixArchive,unixInstaller
-install4jFaster = false
+install4j_home_dir = ~/buildtools/install4j8
+install4j_copyright_message = ...
+install4j_bundle_id = org.jalview.jalview-desktop
+install4j_utils_dir = utils/install4j
+install4j_template = install4j8_template.install4j
+install4j_info_plist_file_associations = file_associations_auto-Info_plist.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,unixArchive,unixInstaller
+install4j_faster = false
+install4j_application_categories = Science;Biology;Java;
+install4j_release_win_application_id = 6595-2347-1923-0725
 
 OSX_KEYSTORE =
 OSX_KEYPASS =
@@ -129,10 +134,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 =
@@ -142,19 +147,20 @@ bamboo_channelbase = https://builds.jalview.org/browse
 bamboo_planKey = 
 bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
 
-eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
 eclipse_codestyle_file = utils/eclipse/JalviewCodeStyle.xml
+eclipse_extra_jdt_prefs_file = utils/eclipse/org.eclipse.jdt.core.jalview.prefs
 eclipse_project_name = jalview
 eclipse_bin_dir = bin
 eclipse_debug = false
 
+# for developing in Eclipse as IDE, set this to automatically copy current swingjs/net.sf.j2s.core.jar to your dropins dir
+jalviewjs_eclipseIDE_auto_copy_j2s_plugin = false
 # Override this in a local.properties file
 jalviewjs_eclipse_root = ~/buildtools/eclipse/jee-2019-09
 
 jalviewjs_eclipse_dropins_dir = utils/jalviewjs/eclipse/dropins
 jalviewjs_swingjs_zip = swingjs/SwingJS-site.zip
-jalviewjs_j2s_plugin = swingjs/net.sf.j2s.core.jar
-jalviewjs_j2s_plugin_j11 = swingjs/net.sf.j2s.core-j11.jar
+jalviewjs_j2s_plugin = swingjs/net.sf.j2s.core-j11.jar
 jalviewjs_libjs_dir = utils/jalviewjs/libjs
 jalviewjs_site_resource_dir = utils/jalviewjs/site-resources
 jalviewjs_classlists_dir = utils/jalviewjs/classlists
@@ -208,6 +214,7 @@ j2s_coretemplate_html = utils/jalviewjs/coretemplate.html
 jalviewjs_j2s_transpile_stdout = j2s-transpile.out
 #jalviewjs_j2s_stderr = j2s-transpile.err # all going into out
 jalviewjs_j2s_to_console = true
+jalviewjs_closure_compiler = tools/closure_compiler.jar
 jalviewjs_j2s_closure_stdout = j2s-closure.out