X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=gradle.properties;h=70a41ff282daa2f6ce2e2eb1eac322d9a50ce6f1;hp=790d17fdaefd1b99e6e79f7ec2f2e8a81e5716ba;hb=4bbd068738ed2e685f580ea1b65a7b11e32d3f3e;hpb=0bfbb0272241e40244d0e32cd7ea66108c8590b4

diff --git a/gradle.properties b/gradle.properties
index 790d17f..70a41ff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,6 @@
-org.gradle.jvmargs=-Xmx1536m -Xms512m
+# Convention for properties.  Read from gradle.properties, use lower_case_underlines for property names.
+# For properties set within build.gradle, use camelCaseNoSpace.
+#
 
 jalviewDir = .
 
@@ -11,7 +13,8 @@ source_dir = src
 test_source_dir = test
 #test_source_dir = utils/jalviewjs/test/test
 
-JALVIEW_VERSION = DEVELOPMENT
+# JALVIEW_VERSION now being set by logic in build.gradle defaulting to looking at jalview.version property in RELEASE file
+#JALVIEW_VERSION = DEVELOPMENT
 INSTALLATION = Source
 jalview_keystore = keys/.keystore
 jalview_keystore.pass = alignmentisfun
@@ -23,38 +26,35 @@ proxyHost = sqid
 jalview_keyalg = SHA1withRSA
 jalview_keydig = SHA1
 
-testngGroups = Functional
-testngExcludedGroups = 
+testng_groups = Functional
+testng_excluded_groups = 
 
 j8libDir = j8lib
 j11libDir = j11lib
 resource_dir = resources
 help_parent_dir = help
 help_dir = help
-docDir = doc
-schemaDir = schemas
+doc_dir = doc
 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
+clover_classes_dir = clover-classes
+clover_sources_instr_dir = clover-instr
+clover_report_dir = clover-report
+clover_lib_dir = utils/clover/lib
+cloverreport_mem = 2g
+cloverreport_jvmargs = -Dfile.encoding=UTF-8
+cloverreport_html_options = 
+cloverreport_xml_options =
+package_dir = dist
 ARCHIVEDIR =
-outputJar = jalview.jar
 
-testOutputDir = tests
-utilsDir = utils
+test_output_dir = tests
+utils_dir = utils
 
 build_properties_file = .build_properties
 application_codebase = *.jalview.org
-mainClass = jalview.bin.Jalview
-shadowJarMainClass = jalview.bin.Launcher
-launcherClass = jalview.bin.Jalview
+main_class = jalview.bin.Jalview
+shadow_jar_main_class = jalview.bin.Launcher
 
 jalview_name = Jalview
 
@@ -107,13 +107,16 @@ getdown_alt_java11_max_version =
 jre_installs_dir = ~/buildtools/jre
 
 j8libDir = j8lib
+j8digestonlyDir = j8digestonly
 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
+j11digestonlyDir = j11digestonly
+
 
 install4j_home_dir = ~/buildtools/install4j8
 install4j_copyright_message = ...
-install4j_macOS_bundle_id = org.jalview.jalview-desktop
+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
@@ -122,7 +125,8 @@ install4j_installer_file_associations = file_associations_auto-install4j8.xml
 install4j_build_dir = build/install4j
 install4j_media_types = windows,macosArchive,unixArchive,unixInstaller
 install4j_faster = false
-install4j_unix_desktop_additions = Categories=Science;Biology;Java;
+install4j_application_categories = Science;Biology;Java;
+install4j_release_win_application_id = 6595-2347-1923-0725
 
 OSX_KEYSTORE =
 OSX_KEYPASS =