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
JAL-3210 fudge for JalviewJS to avoid IntervalStore incompatibility
[jalview.git]
/
gradle.properties
diff --git
a/gradle.properties
b/gradle.properties
index
790d17f
..
a401411
100644
(file)
--- a/
gradle.properties
+++ b/
gradle.properties
@@
-56,7
+56,7
@@
mainClass = jalview.bin.Jalview
shadowJarMainClass = jalview.bin.Launcher
launcherClass = jalview.bin.Jalview
shadowJarMainClass = jalview.bin.Launcher
launcherClass = jalview.bin.Jalview
-jalview_name = Jalview
+gradlePluginsDir = gradle/plugins
getdown_local = false
getdown_website_dir = getdown/website
getdown_local = false
getdown_website_dir = getdown/website
@@
-70,6
+70,7
@@
getdown_launcher_new = getdown-launcher-new.jar
getdown_core = getdown/lib/getdown-core.jar
getdown_build_properties = build_properties
getdown_launch_jvl_name = channel_launch
getdown_core = getdown/lib/getdown-core.jar
getdown_build_properties = build_properties
getdown_launch_jvl_name = channel_launch
+getdown_txt_title = Jalview
getdown_txt_allow_offline = true
getdown_txt_max_concurrent_downloads = 10
# now got better defaults when not set
getdown_txt_allow_offline = true
getdown_txt_max_concurrent_downloads = 10
# now got better defaults when not set
@@
-78,6
+79,8
@@
getdown_txt_max_concurrent_downloads = 10
#getdown_txt_jalview.jvmmemmax = 32G
getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR%
getdown_txt_strict_comments = true
#getdown_txt_jalview.jvmmemmax = 32G
getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR%
getdown_txt_strict_comments = true
+getdown_txt_title = Jalview
+getdown_txt_ui.name = Jalview
getdown_txt_ui.progress_sync_before_shown = true
getdown_txt_ui.progress_sync_after_shown = false
getdown_txt_ui.keep_on_top = true
getdown_txt_ui.progress_sync_before_shown = true
getdown_txt_ui.progress_sync_after_shown = false
getdown_txt_ui.keep_on_top = true
@@
-120,9
+123,9
@@
install4j_info_plist_file_associations = file_associations_auto-Info_plist.xml
install4j_installer_file_associations = file_associations_auto-install4j8.xml
#install4j_DMG_uninstaller_app_files = uninstall_old_jalview_files.xml
install4j_build_dir = build/install4j
install4j_installer_file_associations = file_associations_auto-install4j8.xml
#install4j_DMG_uninstaller_app_files = uninstall_old_jalview_files.xml
install4j_build_dir = build/install4j
-install4j_media_types = windows,macosArchive,unixArchive,unixInstaller
+install4j_media_types = windows,macosArchive,linuxRPM,linuxDeb,unixArchive,unixInstaller
install4j_faster = false
install4j_faster = false
-install4j_unix_desktop_additions = Categories=Science;Biology;Java;
+install4j_installer_name = Jalview Installer
OSX_KEYSTORE =
OSX_KEYPASS =
OSX_KEYSTORE =
OSX_KEYPASS =
@@
-145,6
+148,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
@@
-157,7
+161,7
@@
jalviewjs_eclipse_root = ~/buildtools/eclipse/jee-2019-09
jalviewjs_eclipse_dropins_dir = utils/jalviewjs/eclipse/dropins
jalviewjs_swingjs_zip = swingjs/SwingJS-site.zip
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 = 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_libjs_dir = utils/jalviewjs/libjs
jalviewjs_site_resource_dir = utils/jalviewjs/site-resources
jalviewjs_classlists_dir = utils/jalviewjs/classlists
@@
-181,8
+185,10
@@
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.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
#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