Merge branch 'releases/Release_2_11_3_Branch'

[jalview.git] / gradle.properties

diff --git a/gradle.properties b/gradle.properties
index 983eb4a..79fb11d 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,12 +22,14 @@ jalview_key = jalview
 jalview_key.pass = alignmentisfun
 jalview_tsaurl =
 proxyPort = 80
-proxyHost = sqid
+proxyHost = squid
 jalview_keyalg = SHA1withRSA
 jalview_keydig = SHA1
 
 testng_groups = Functional
 testng_excluded_groups = 
+test_output =
+ 
 
 j8libDir = j8lib
 j11libDir = j11lib
@@ -58,11 +60,18 @@ shadow_jar_main_class = jalview.bin.Launcher
 
 jalview_name = Jalview
 
+hugo_old_jvl = utils/hugo/old_jvl.txt
+hugo_jalviewjs = utils/hugo/jalviewjs.txt
 hugo_build_dir = build/website/hugo
 hugo_data_installers_dir = data/installers
 hugo_version_archive_dir = content/development/archive
 hugo_templates_dir = utils/hugo/templates
+releases_template = help/templates/releases.html
+whatsnew_template = help/templates/whatsNew.html
 releases_html = html/releases.html
+whatsnew_html = html/whatsNew.html
+whatsnew_dir = help/markdown/whatsnew
+releases_dir = help/markdown/releases
 # these are going to be used in the future to gather website release files together
 getdown_website_dir = build/website/docroot/getdown
 getdown_archive_dir = build/website/docroot/old
@@ -122,14 +131,14 @@ flexmark_css = utils/doc/github.css
 channel_properties_dir = utils/channels
 channel_props = channel.props
 
-install4j_home_dir = ~/buildtools/install4j9
+install4j_home_dir = ~/buildtools/install4j10
 install4j_copyright_message = ...
 install4j_bundle_id = org.jalview.jalview-desktop
 install4j_utils_dir = utils/install4j
 install4j_images_dir = utils/install4j
-install4j_template = install4j9_template.install4j
+install4j_template = install4j10_template.install4j
 install4j_info_plist_file_associations = file_associations_auto-Info_plist.xml
-install4j_installer_file_associations = file_associations_auto-install4j8.xml
+install4j_installer_file_associations = file_associations_auto-install4j10.xml
 #install4j_DMG_uninstaller_app_files = uninstall_old_jalview_files.xml
 install4j_build_dir = build/install4j
 install4j_executable_name = jalviewg
@@ -155,6 +164,7 @@ OSX_APPLEID =
 OSX_ALTOOLPASS =
 
 CHANNEL=LOCAL
+BACKGROUNDIMAGETEXT=false
 getdown_channel_base = https://www.jalview.org/getdown
 getdown_archive_base = https://www.jalview.org/old
 getdown_app_dir_release = release
@@ -165,9 +175,11 @@ getdown_rsync_dest = /Volumes/jalview/docroot/getdown
 reportRsyncCommand =
 RUNRSYNC=false
 
+imagemagick_convert = ~/buildtools/imagemagick/bin/convert
+
 bamboo_channelbase = https://builds.jalview.org/browse
 bamboo_planKey = 
-bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
+bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-build-for-website/default
 
 eclipse_codestyle_file = utils/eclipse/JalviewCodeStyle.xml
 eclipse_extra_jdt_prefs_file = utils/eclipse/org.eclipse.jdt.core.jalview.prefs
@@ -191,7 +203,7 @@ jalviewjs_j2s_alt_file_property_config = j2s.config.altfileproperty
 # for developing in Eclipse as IDE, set this to automatically copy current swingjs/net.sf.j2s.core.jar to your dropins dir
 jalviewjs_eclipseIDE_auto_copy_j2s_plugin = false
 # Override this in a local.properties file
-jalviewjs_eclipse_root = ~/buildtools/eclipse/jee-2019-09
+jalviewjs_eclipse_root = ~/buildtools/eclipse/latest
 
 jalviewjs_eclipse_dropins_dir = utils/jalviewjs/eclipse/dropins
 jalviewjs_swingjs_zip = swingjs/SwingJS-site.zip
@@ -250,5 +262,14 @@ jalviewjs_j2s_to_console = true
 jalviewjs_closure_compiler = tools/closure_compiler.jar
 jalviewjs_j2s_closure_stdout = j2s-closure.out
 
+# for checking jalviewjs launches okay
+jalviewjs_chromium_binary = ~/buildtools/chromium/chrome
+jalviewjs_macos_chromium_binary = /Applications/Chromium.app/Contents/MacOS/Chromium
+jalviewjs_chromium_user_dir = chromium
+jalviewjs_chromium_idle_timeout = 10
+jalviewjs_chromium_overall_timeout = 40
+jalviewjs_chromium_profile_name = BUILD
+jalviewjs_stderr_launch = utils/jalviewjs/chromium_test/jalview_bin_Jalview-stderr.html
+jalviewjs_desktop_init_string = JALVIEWJS: CREATED DESKTOP
 
 testp=gradle.properties