git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/JAL-3551Pymol' into develop
[jalview.git]
/
gradle.properties
diff --git
a/gradle.properties
b/gradle.properties
index
14ef211
..
01d4b9c
100644
(file)
--- a/
gradle.properties
+++ b/
gradle.properties
@@
-1,3
+1,7
@@
+# Convention for properties. Read from gradle.properties, use lower_case_underlines for property names.
+# For properties set within build.gradle, use camelCaseNoSpace.
+#
+
jalviewDir = .
#JAVA_VERSION = 1.8
jalviewDir = .
#JAVA_VERSION = 1.8
@@
-141,6
+145,7
@@
bamboo_channelbase = https://builds.jalview.org/browse
bamboo_planKey =
bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
bamboo_planKey =
bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
+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_extra_jdt_prefs_file = utils/eclipse/org.eclipse.jdt.core.jalview.prefs
eclipse_project_name = jalview
eclipse_bin_dir = bin
@@
-177,6
+182,7
@@
jalviewjs_core_name = _jalview
jalviewjs_name = JalviewJS
jalviewjs_core_key = core
#jalviewjs_core_key = preloadCore
jalviewjs_name = JalviewJS
jalviewjs_core_key = core
#jalviewjs_core_key = preloadCore
+jalviewjs_ignore_transpile_errors = true
j2s.compiler.status = enable
#j2s.site.directory = null ## site defined from buildDir+'/jalviewjs/'+jalviewjs_site_dir
j2s.compiler.status = enable
#j2s.site.directory = null ## site defined from buildDir+'/jalviewjs/'+jalviewjs_site_dir
@@
-205,6
+211,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_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
jalviewjs_j2s_closure_stdout = j2s-closure.out