X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=gradle.properties;h=70a41ff282daa2f6ce2e2eb1eac322d9a50ce6f1;hp=9e7d8daf63f70454b9ce93493a07c106261c83b5;hb=HEAD;hpb=9e7c315c6ac828989a2d7f49dcb7e451f38df9ff

diff --git a/gradle.properties b/gradle.properties
index 9e7d8da..79fb11d 100644
--- 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,10 +60,25 @@ 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
+getdown_files_dir = build/getdown/files
+
 getdown_local = false
-getdown_website_dir = getdown/website
 getdown_resource_dir = resource
-getdown_files_dir = getdown/files
 getdown_lib_dir = getdown/lib
 getdown_launcher = getdown-launcher.jar
 getdown_launcher_local = getdown-launcher-local.jar
@@ -81,7 +98,7 @@ getdown_txt_max_concurrent_downloads = 10
 # now got better (dynamic) defaults when jvmmem* not set
 #getdown_txt_jalview.jvmmempc = 90
 #getdown_txt_jalview.jvmmemmax = 32G
-getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR%
+getdown_txt_multi_jvmarg = -Dgetdowninstanceappdir=%APPDIR%
 getdown_txt_strict_comments = true
 getdown_txt_ui.progress_sync_before_shown = true
 getdown_txt_ui.progress_sync_after_shown = false
@@ -100,8 +117,8 @@ getdown_alt_java8_min_version  = 01080000
 getdown_alt_java8_max_version  = 01089999
 getdown_alt_java11_min_version = 11000000
 getdown_alt_java11_max_version =
-#getdown_alt_java11_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre11.jar,[linux-amd64] /getdown/jre/linux-jre11.tgz,[mac os x] /getdown/jre/macos-jre11.tgz
-#getdown_alt_java8_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre1.8.tgz,[linux-amd64] /getdown/jre/linux-jre1.8.tgz,[mac os x] /getdown/jre/macos-jre1.8.tgz
+#getdown_alt_java11_txt_multi_java_location = [windows-amd64] /getdown/jre/jre-11-windows-x64.zip,[linux-amd64] /getdown/jre/jre-11-linux-x64.zip,[mac os x] /getdown/jre/jre-11-mac-x64.zip
+#getdown_alt_java8_txt_multi_java_location = [windows-amd64] /getdown/jre/jre-8-windows-x64.zip,[linux-amd64] /getdown/jre/jre-8-linux-x64.zip,[mac os x] /getdown/jre/jre-8-mac-x64.zip
 jre_installs_dir = ~/buildtools/jre
 
 j8libDir = j8lib
@@ -112,15 +129,16 @@ j11modules = com.sun.istack.runtime,com.sun.xml.bind,com.sun.xml.fastinfoset,com
 flexmark_css = utils/doc/github.css
 
 channel_properties_dir = utils/channels
+channel_props = channel.props
 
-install4j_home_dir = ~/buildtools/install4j8
+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 = install4j8_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
@@ -135,9 +153,9 @@ 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
 getdown_wrapper_script_dir = bin
-getdown_wrapper_link = jalview
 getdown_bash_wrapper_script = jalview.sh
 getdown_powershell_wrapper_script = jalview.ps1
+getdown_batch_wrapper_script = jalview.bat
 
 OSX_KEYSTORE =
 OSX_KEYPASS =
@@ -146,7 +164,9 @@ 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
 getdown_app_dir_alt = alt
 getdown_app_dir_java = jre
@@ -155,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
@@ -181,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
@@ -222,7 +244,7 @@ j2s.excluded.paths = test;testng;util
 #j2s.compiler.nonqualified.classes = null
 #j2s.compiler.mode = debug
 #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.class.replacements = org.apache.logging.log4j.->jalview.javascript.log4j.
 j2s.template.html = utils/jalviewjs/template.html
 j2s_coretemplate_html = utils/jalviewjs/coretemplate.html
 #output file name for logging methods declared - delete the file to regenerate a listing 
@@ -240,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