X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=gradle.properties;h=f2fe5d8b38acea8ed2930fcffbb93f598668a180;hb=907dcf078cffc231ed200ecb814826fc16788717;hp=85ee158c43ace3156a827a1a057b52bc748c3145;hpb=fee03a7c043c336cee828b2382d56428e57483f2;p=jalview.git

diff --git a/gradle.properties b/gradle.properties
index 85ee158..f2fe5d8 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,11 +41,10 @@ packageDir = dist
 ARCHIVEDIR =
 outputJar = jalview.jar
 
-testSourceDir = test
 testOutputDir = tests
 utilsDir = utils
 
-buildPropertiesFile = .build_properties
+build_properties_file = .build_properties
 application_codebase = *.jalview.org
 mainClass = jalview.bin.Jalview
 shadowJarMainClass = jalview.bin.Launcher
@@ -141,26 +146,35 @@ 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
-
-jalviewjs_eclipse_root = ~/buildtools/eclipse/eclipse-jee-2019-09/eclipse
-
-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_site_dir = site
-jalviewjs_j2s_subdir = swingjs/j2s
-jalviewjs_j2s_settings_file = dot_j2s
+eclipse_debug = false
+
+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_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
+#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
+# these dirs are subdirs of the site dir
+jalviewjs_swingjs_subdir = swingjs
+jalviewjs_j2s_subdir = swingjs/j2s
+jalviewjs_js_subdir = swingjs/js
 #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
+jalviewjs_core_name = _jalview
+jalviewjs_name = JalviewJS
 
 j2s.compiler.status = enable
 #j2s.site.directory = null ## site defined from buildDir+'/jalviewjs/'+jalviewjs_site_dir
@@ -168,7 +182,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
@@ -176,6 +190,7 @@ j2s.include.tests = true
 #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_template_html = utils/jalviewjs/template.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
@@ -185,9 +200,10 @@ j2s.template.html = utils/jalviewjs/template.html
 #output will be comma-separated: called method,caller class 
 #j2s.prop.j2s.log.all.calls=true
 
-jalviewjs_j2s_stdout = j2s-transpile.out
-jalviewjs_j2s_stderr = j2s-transpile.err
+jalviewjs_j2s_transpile_stdout = j2s-transpile.out
+#jalviewjs_j2s_stderr = j2s-transpile.err # all going into out
 jalviewjs_j2s_to_console = true
+jalviewjs_j2s_closure_stdout = j2s-closure.out
 
 
- 
+testp=gradle.properties