X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=gradle.properties;h=acb65e91b78e022fc1b3c62044c20e33f7232fa2;hp=d6816300d29128dbd8c2d1f999c493a09fee2fbe;hb=627937c70fea0978f2075f198836756e94a81113;hpb=d7368218039692c3cb2ab5c1a83388f98b89c821

diff --git a/gradle.properties b/gradle.properties
index d681630..acb65e9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,7 @@ jalview_key = jalview
 jalview_key.pass = alignmentisfun
 jalview_tsaurl =
 proxyPort = 80
-proxyHost = sqid
+proxyHost = squid
 jalview_keyalg = SHA1withRSA
 jalview_keydig = SHA1
 
@@ -58,10 +58,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
@@ -74,21 +89,21 @@ 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_logos.icns
+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 (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
 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.progress = 20, 440, 600, 22
 getdown_txt_ui.progress_bar = AAAAFF
@@ -100,8 +115,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,30 +127,43 @@ 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/install4j9
 install4j_copyright_message = ...
 install4j_bundle_id = org.jalview.jalview-desktop
 install4j_utils_dir = utils/install4j
-install4j_template = install4j8_template.install4j
+install4j_images_dir = utils/install4j
+install4j_template = install4j9_template.install4j
 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_executable_name = jalviewg
 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_logos.icns
-install4j_windows_icons_file = jalview_logos.ico
-install4j_png_icon_file = Jalview-Logo.png
+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
+getdown_wrapper_script_dir = bin
+getdown_bash_wrapper_script = jalview.sh
+getdown_powershell_wrapper_script = jalview.ps1
+getdown_batch_wrapper_script = jalview.bat
 
 OSX_KEYSTORE =
 OSX_KEYPASS =
 JSIGN_SH = echo
+OSX_APPLEID =
+OSX_ALTOOLPASS =
 
 CHANNEL=LOCAL
 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
@@ -154,6 +182,19 @@ eclipse_project_name = jalview
 eclipse_bin_dir = bin
 eclipse_debug = false
 
+## IMPORTANT for headless build
+# to enable `gradle jalviewjs` headless build you MUST set
+# j2s.config.altfileproperty = org.jalview.jalviewjsj2sfilename
+# (or set to whatever value jalviewjs_j2s_alt_file_property is set to)
+# in your ./.j2s file
+# OR run the task `gradle jalviewjsEnableAltFileProperty` to do that for you (before headless build task)
+jalviewjs_j2s_alt_file_property = org.jalview.jalviewjsj2sfilename
+jalviewjs_j2s_alt_settings = build/jalviewjs/config/j2s
+
+# these are used for actual .j2s file to pass on to alt j2s file
+jalviewjs_j2s_settings = .j2s
+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
@@ -166,7 +207,6 @@ jalviewjs_libjs_dir = utils/jalviewjs/libjs
 jalviewjs_site_resource_dir = utils/jalviewjs/site-resources
 jalviewjs_classlists_dir = utils/jalviewjs/classlists
 jalviewjs_classlist_jalview = utils/jalviewjs/_j2sclasslist.txt
-jalviewjs_j2s_settings = .j2s
 #jalviewjs_eclipse_workspace = ~/tmp/eclipse-workspace
 # these 3 files/dirs found in build/jalviewjs
 jalviewjs_eclipse_tmp_dropins_dir = eclipse_dropins
@@ -199,7 +239,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