X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gradle.properties;h=bf23db9393bb007de327459df4a57cca0b1bcdba;hb=8ccb3fbe64c5badd73c94f3c1ceb1e24759ff69d;hp=03ec7203da75ad252a095cd6fe9b028feeea2dcb;hpb=ccf06ac048c367e28d5e41a569bd95d5a2a77989;p=jalview.git

diff --git a/gradle.properties b/gradle.properties
index 03ec720..bf23db9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,13 +3,11 @@ jalviewDir = .
 #JAVA_VERSION = 1.8
 JAVA_VERSION = 11
 
-ECLIPSE_IDE_DEVELOPER = false
+source_dir = src
+#source_dir = utils/jalviewjs/test/src
 
-sourceDir = src
-#sourceDir = utils/jalviewjs/test/src
-
-testSourceDir = test
-#testSourceDir = utils/jalviewjs/test/test
+test_source_dir = test
+#test_source_dir = utils/jalviewjs/test/test
 
 JALVIEW_VERSION = DEVELOPMENT
 INSTALLATION = Source
@@ -27,13 +25,12 @@ testngGroups = Functional
 
 j8libDir = j8lib
 j11libDir = j11lib
-resourceDir = resources
-helpParentDir = help
-helpDir = help
-helpOutputDir = build/distributions/help
+resource_dir = resources
+help_parent_dir = help
+help_dir = help
 docDir = doc
 schemaDir = schemas
-classesDir = classes
+classes_dir = classes
 examplesDir = examples
 clover = false
 use_clover = false
@@ -145,20 +142,22 @@ 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
 
+# 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_libjs_dir = utils/jalviewjs/libjs
 jalviewjs_site_resource_dir = utils/jalviewjs/site-resources
 jalviewjs_classlists_dir = utils/jalviewjs/classlists
-jalviewjs_classlist_jmol = utils/jalviewjs/_j2sclasslist_jmol.txt
 jalviewjs_classlist_jalview = utils/jalviewjs/_j2sclasslist.txt
 jalviewjs_j2s_settings = .j2s
 #jalviewjs_eclipse_workspace = ~/tmp/eclipse-workspace
@@ -175,8 +174,14 @@ jalviewjs_eclipse_build_arg = cleanBuild
 jalviewjs_server_port = 9001
 jalviewjs_server_wait = 30
 jalviewjs_server_resource = /jalview_bin_Jalview.html
+jalviewjs_core_name = _jalview
+jalviewjs_name = JalviewJS
+jalviewjs_core_key = core
+#jalviewjs_core_key = preloadCore
+jalviewjs_ignore_transpile_errors = true
 
 j2s.compiler.status = enable
+j2s.compiler.java.version = 11
 #j2s.site.directory = null ## site defined from buildDir+'/jalviewjs/'+jalviewjs_site_dir
 #j2s.log.methods.declared = j2s_methods_declared.log
 #j2s.log.methods.called = j2s_methods_called.log
@@ -190,6 +195,7 @@ j2s.excluded.paths = test;testng;util
 #a semicolon-separated list of package (foo.) or class (foo.bar) replacements to be made 
 j2s.class.replacements = org.apache.log4j.->jalview.javascript.log4j.
 j2s.template.html = utils/jalviewjs/template.html
+j2s_coretemplate_html = utils/jalviewjs/coretemplate.html
 #output file name for logging methods declared - delete the file to regenerate a listing 
 #j2s.prop.j2s.log.methods.declared=swingjs/methodsDeclared_csv
 #output file name for logging methods called - delete the file to regenerate a listing