X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=gradle.properties;h=b3590a7cbdeb4a060b219f80e2392617efd23b52;hb=5d501d5230ad1c42f1e17a485cb86a04ba8b538a;hp=01d4b9c8c71cd813255550c8f3dc6024faff16d7;hpb=a02114f9eb9665810b4c1d89c9806dabcb2b4fd7;p=jalview.git

diff --git a/gradle.properties b/gradle.properties
index 01d4b9c..b3590a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,8 @@ source_dir = src
 test_source_dir = test
 #test_source_dir = utils/jalviewjs/test/test
 
-JALVIEW_VERSION = DEVELOPMENT
+# JALVIEW_VERSION now being set by logic in build.gradle defaulting to looking at jalview.version property in RELEASE file
+#JALVIEW_VERSION = DEVELOPMENT
 INSTALLATION = Source
 jalview_keystore = keys/.keystore
 jalview_keystore.pass = alignmentisfun
@@ -60,7 +61,6 @@ jalview_name = Jalview
 getdown_local = false
 getdown_website_dir = getdown/website
 getdown_resource_dir = resource
-#getdown_j11lib_dir = j11lib
 getdown_files_dir = getdown/files
 getdown_lib_dir = getdown/lib
 getdown_launcher = getdown-launcher.jar
@@ -69,11 +69,17 @@ 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_images_dir = utils/getdown
+getdown_background_image = jalview_logo_background_getdown-640x480.png
+getdown_instant_background_image = jalview_logo_background_getdown_instant-640x480.png
+getdown_error_background = jalview_logo_background_getdown_error-640x480.png
+getdown_progress_image = jalview_logo_background_getdown-progress.png
+getdown_mac_dock_icon = jalview_logo.icns
+getdown_icon = Jalview-Logo.png
 getdown_txt_allow_offline = true
 getdown_txt_max_concurrent_downloads = 10
-# now got better defaults when not set
+# now got better (dynamic) defaults when jvmmem* not set
 #getdown_txt_jalview.jvmmempc = 90
-# now got better defaults when not set
 #getdown_txt_jalview.jvmmemmax = 32G
 getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR%
 getdown_txt_strict_comments = true
@@ -82,21 +88,14 @@ getdown_txt_ui.progress_sync_after_shown = false
 getdown_txt_ui.keep_on_top = true
 getdown_txt_ui.display_appbase = true
 getdown_txt_ui.display_version = true
-getdown_txt_ui.min_show_seconds = 6
+getdown_txt_ui.min_show_seconds = 8
 getdown_txt_ui.background = FFFFFF
-getdown_txt_ui.background_image = utils/getdown/jalview_logo_background_getdown-640x480.png
-getdown_txt_ui.instant_background_image = utils/getdown/jalview_logo_background_getdown_instant-640x480.png
-getdown_txt_ui.error_background = utils/getdown/jalview_logo_background_getdown_error-640x480.png
-getdown_txt_ui.progress_image = utils/getdown/jalview_logo_background_getdown-progress.png
-getdown_txt_ui.icon = resources/images/JalviewLogo_Huge.png
 getdown_txt_ui.progress = 20, 440, 600, 22
 getdown_txt_ui.progress_bar = AAAAFF
 getdown_txt_ui.progress_text = 000000
 getdown_txt_ui.status = 20, 380, 600, 58
 getdown_txt_ui.status_text = 000066
-#getdown_txt_ui.text_shadow = FFFFFF
 getdown_txt_ui.install_error = https://www.jalview.org/faq/getdownerror
-getdown_txt_ui.mac_dock_icon = resources/images/jalview_logos.ico
 getdown_alt_java8_min_version  = 01080000
 getdown_alt_java8_max_version  = 01089999
 getdown_alt_java11_min_version = 11000000
@@ -110,10 +109,15 @@ j11libDir = j11lib
 j11modDir = j11mod
 j11modules = com.sun.istack.runtime,com.sun.xml.bind,com.sun.xml.fastinfoset,com.sun.xml.streambuffer,com.sun.xml.txw2,com.sun.xml.ws.policy,java.activation,java.annotation,java.base,java.compiler,java.datatransfer,java.desktop,java.logging,java.management,java.management.rmi,java.naming,java.prefs,java.rmi,java.scripting,java.security.sasl,java.sql,java.xml,java.xml.bind,java.xml.soap,java.xml.ws,javax.jws,jdk.httpserver,jdk.jsobject,jdk.unsupported,jdk.xml.dom,org.jvnet.mimepull,org.jvnet.staxex,javax.servlet.api,java.ws.rs
 
+flexmark_css = utils/doc/github.css
+
+channel_properties_dir = utils/channels
+
 install4j_home_dir = ~/buildtools/install4j8
 install4j_copyright_message = ...
 install4j_bundle_id = org.jalview.jalview-desktop
 install4j_utils_dir = utils/install4j
+install4j_images_dir = utils/install4j
 install4j_template = install4j8_template.install4j
 install4j_info_plist_file_associations = file_associations_auto-Info_plist.xml
 install4j_installer_file_associations = file_associations_auto-install4j8.xml
@@ -123,14 +127,17 @@ install4j_media_types = windows,macosArchive,unixArchive,unixInstaller
 install4j_faster = false
 install4j_application_categories = Science;Biology;Java;
 install4j_release_win_application_id = 6595-2347-1923-0725
+install4j_mac_icons_file = jalview_logo.icns
+install4j_windows_icons_file = jalview_logo.ico
+install4j_png_icon_file = jalview_logo.png
+install4j_background = jalview_logo_background_fade-640x480.png
+install4j_dmg_background = jalview_dmg_background-NON-RELEASE.png
+install4j_dmg_ds_store = jalview_dmg_DS_Store
 
 OSX_KEYSTORE =
 OSX_KEYPASS =
 JSIGN_SH = echo
 
-pandoc_exec = /usr/local/bin/pandoc,/usr/bin/pandoc
-dev = false
-
 CHANNEL=LOCAL
 getdown_channel_base = https://www.jalview.org/getdown
 getdown_app_dir_release = release
@@ -158,7 +165,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_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