X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gradle.properties;h=79fb11d4cce7f0735c9c108465cd314a2c2ab908;hb=HEAD;hp=239fcf6e5461bf33620166e832ec1a6d2633f276;hpb=07727bb7e06eb681af51a95e941cb035ac637d10;p=jalview.git

diff --git a/gradle.properties b/gradle.properties
index 239fcf6..823264c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,6 +28,8 @@ jalview_keydig = SHA1
 
 testng_groups = Functional
 testng_excluded_groups = 
+test_output =
+ 
 
 j8libDir = j8lib
 j11libDir = j11lib
@@ -58,13 +60,16 @@ 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
+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
@@ -78,7 +83,6 @@ getdown_lib_dir = getdown/lib
 getdown_launcher = getdown-launcher.jar
 getdown_launcher_local = getdown-launcher-local.jar
 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
@@ -93,7 +97,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 = -Dgetdowninstanceappdir=%APPDIR%
+getdown_txt_resource = getdown/lib/getdown-core.jar
 getdown_txt_strict_comments = true
 getdown_txt_ui.progress_sync_before_shown = true
 getdown_txt_ui.progress_sync_after_shown = false
@@ -126,18 +130,19 @@ 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
-install4j_media_types = windows,macosArchive,unixArchive,unixInstaller
+#install4j_media_types = windows,macosArchive,unixArchive,unixInstaller
+#install4j_build_ids = WINDOWS-X64-EXE,MACOS-X64-DMG,MACOS-AARCH64-DMG,LINUX-X64-SH,LINUX-AARCH-SH,UNIX--SH,UNIX--TGZ
 install4j_faster = false
 install4j_application_categories = Science;Biology;Java;
 install4j_release_win_application_id = 6595-2347-1923-0725
@@ -146,11 +151,24 @@ 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_background_filename = background.png
 install4j_dmg_ds_store = jalview_dmg_DS_Store
+install4j_dmg_ds_store_json = jalview_dmg_DS_Store.json
+install4j_dmg_volume_icon = jalview-VolumeIcon.icns
+install4j_installer_icon = jalview_installer.png
+install4j_installer_mac_icon = jalview_installer.icns
+install4j_installer_windows_icon = jalview_installer.ico
+install4j_default_vmoptions = default.vmoptions
+jalview_customise_ds_store = utils/macos_dmg/jalview_customise_dsstore.py
+
+
 getdown_wrapper_script_dir = bin
 getdown_bash_wrapper_script = jalview.sh
 getdown_powershell_wrapper_script = jalview.ps1
-getdown_batch_wrapper_script = jalview.bat
+getdown_bash_update_script = update.sh
+getdown_powershell_update_script = update.ps1
+getdown_run_other_script = run_other_script.ps1
+getdown_run_powershell = run_powershell.bat
 
 OSX_KEYSTORE =
 OSX_KEYPASS =
@@ -159,6 +177,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
@@ -169,9 +188,14 @@ 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
+#bamboo_buildResultsUrl =
+#bamboo_buildResultsArtifactPath = /artifact/shared/getdown
+#bamboo_buildResultsKey =
 
 eclipse_codestyle_file = utils/eclipse/JalviewCodeStyle.xml
 eclipse_extra_jdt_prefs_file = utils/eclipse/org.eclipse.jdt.core.jalview.prefs
@@ -195,7 +219,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
@@ -254,5 +278,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