X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=gradle.properties;h=7569d00a004ac4c923a9134be3335b0ab336a333;hb=4cacd38cf10da2dedda3926d593eabfd5af69646;hp=168de0404dd7b32a983b3421557f51e95a244b93;hpb=741ffd68a834d7501e3fc480f8917429d0e687c4;p=jalview.git

diff --git a/gradle.properties b/gradle.properties
index 168de04..7569d00 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,13 @@ jalviewDir = .
 
 #JAVA_VERSION = 1.8
 JAVA_VERSION = 11
+
+sourceDir = src
+#sourceDir = utils/jalviewjs/test/src
+
+testSourceDir = test
+#testSourceDir = utils/jalviewjs/test/test
+
 JALVIEW_VERSION = DEVELOPMENT
 INSTALLATION = Source
 jalview_keystore = keys/.keystore
@@ -23,7 +30,6 @@ helpParentDir = help
 helpDir = help
 helpOutputDir = build/distributions/help
 docDir = doc
-sourceDir = src
 schemaDir = schemas
 classesDir = classes
 examplesDir = examples
@@ -35,7 +41,6 @@ packageDir = dist
 ARCHIVEDIR =
 outputJar = jalview.jar
 
-testSourceDir = test
 testOutputDir = tests
 utilsDir = utils
 
@@ -141,22 +146,24 @@ bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
 eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
 eclipse_project_name = jalview
 eclipse_bin_dir = bin
+eclipse_debug = false
 
-jalviewjs_eclipse_root = ~/buildtools/eclipse/eclipse-jee-2019-09
+jalviewjs_eclipse_root = ~/buildtools/eclipse/jee-2019-09
 
-jalviewjs_utils_dir = utils/jalviewjs
-jalviewjs_eclipse_dropins_dir = eclipse/dropins
-jalviewjs_swingjs_zip = SwingJS-site.zip
-jalviewjs_libjs_dir = libjs
-jalviewjs_resource_dir = resources
-jalviewjs_site_resource_dir = site-resources
+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_libjs_dir = utils/jalviewjs/libjs
+jalviewjs_site_resource_dir = utils/jalviewjs/site-resources
+jalviewjs_j2s_settings = .j2s
+#jalviewjs_eclipse_workspace = ~/tmp/eclipse-workspace
+# these 3 files/dirs found in build/jalviewjs
+jalviewjs_eclipse_tmp_dropins_dir = eclipse_dropins
+jalviewjs_eclipse_workspace_location_file = eclipse_workspace_location
 jalviewjs_site_dir = site
 jalviewjs_j2s_subdir = swingjs/j2s
-jalviewjs_j2s_settings_file = dot_j2s
-jalviewjs_j2s_settings = .j2s
-jalviewjs_eclipse_workspace = ../tmp/eclipse-workspace
 #jalviewjs_eclipseBuildArg = build
-jalviewjs_eclipseBuildArg = cleanBuild
+jalviewjs_eclipse_build_arg = cleanBuild
 jalviewjs_server_port = 9001
 jalviewjs_server_wait = 30
 jalviewjs_server_resource = /jalview_bin_Jalview.html
@@ -167,7 +174,7 @@ j2s.compiler.status = enable
 #j2s.log.methods.called = j2s_methods_called.log
 #a semicolon-separated list of package-level file paths to be excluded
 j2s.excluded.paths = test;testng;util
-j2s.include.tests = true
+#j2s.include.tests = true
 #j2s.testing = null
 #j2s.compiler.nonqualified.packages = null
 #j2s.compiler.nonqualified.classes = null
@@ -185,8 +192,8 @@ j2s.template.html = utils/jalviewjs/template.html
 #j2s.prop.j2s.log.all.calls=true
 
 jalviewjs_j2s_stdout = j2s-transpile.out
-jalviewjs_j2s_stderr = j2s-transpile.err
+#jalviewjs_j2s_stderr = j2s-transpile.err # all going into out
 jalviewjs_j2s_to_console = true
 
 
- 
+testp=gradle.properties