Ben Soares [Mon, 29 Jul 2024 18:06:45 +0000 (19:06 +0100)]
JAL-3631 Ensure the DMG default vmoptions.txt has the commented properties
Ben Soares [Mon, 29 Jul 2024 18:04:49 +0000 (19:04 +0100)]
JAL-3631 Add PID to console info - only available in Java 9+
Ben Soares [Fri, 26 Jul 2024 16:50:10 +0000 (17:50 +0100)]
JAL-3631 Added an --update option to the jalview.sh launcher (does not launch, just updates). Combining the update script with this as there's a lot of work to make this shell script Linux/macOS/Cygwin/WSL compliant that doesn't need to be duplicated. PS1 still to do.
Ben Soares [Fri, 26 Jul 2024 14:39:41 +0000 (15:39 +0100)]
JAL-3631 Added verbose and quiet options, and matched vmoptions with installer. Provenance of options added.
Ben Soares [Fri, 26 Jul 2024 14:38:28 +0000 (15:38 +0100)]
JAL-3631 Some minor bugfixes to the install4j installer and word changes to match macos-install-jalview.sh
Ben Soares [Thu, 25 Jul 2024 16:35:57 +0000 (17:35 +0100)]
JAL-3631 Comprehensive install shell script for macos
Ben Soares [Thu, 25 Jul 2024 16:35:37 +0000 (17:35 +0100)]
JAL-3631 minor changes - spelling and comment spacing in install4j template
Ben Soares [Wed, 24 Jul 2024 13:17:47 +0000 (14:17 +0100)]
JAL-3631 Correct some text to add the file separator which is being looked for too in substitutions
Ben Soares [Tue, 23 Jul 2024 16:03:43 +0000 (17:03 +0100)]
JAL-3631 Consolidated repeated code (mainly form verification). Added appdir hash routine. Wizard installer of .app bundle now deprecated, can't be used :(
Ben Soares [Mon, 22 Jul 2024 19:36:33 +0000 (20:36 +0100)]
JAL-3631 Minor fixes to the advanced options scripts
Ben Soares [Mon, 22 Jul 2024 17:08:36 +0000 (18:08 +0100)]
JAL-3631 Made both Advanced options into a group. Changed visibility scripts to minimum required. Added a Don't setUserAppdirPath comment.
Ben Soares [Sun, 21 Jul 2024 19:32:59 +0000 (20:32 +0100)]
JAL-3631 Improved tooltip on advanced options. Ensure empty box/border isn't displayed when no advanced options. Add message to clarify no Advanced options will be applied when checkbox not ticked.
Ben Soares [Sat, 20 Jul 2024 16:55:37 +0000 (17:55 +0100)]
JAL-3631 Group/box and simplify visibility of advanced options on additional tasks screen in the install4j installation wizard.
Ben Soares [Sat, 20 Jul 2024 08:52:28 +0000 (09:52 +0100)]
JAL-3631 Consistently and correctly enable/diable/hide elements on the additional tasks screen in the install4j installation wizard.
Ben Soares [Fri, 19 Jul 2024 17:47:35 +0000 (18:47 +0100)]
JAL-3631 Customise the user-space path in the install4j installation wizard. Not ready yet.
Ben Soares [Thu, 18 Jul 2024 16:21:58 +0000 (17:21 +0100)]
JAL-3631 Tweaks to getdown for updating and user appdir properties
Ben Soares [Thu, 18 Jul 2024 11:05:34 +0000 (12:05 +0100)]
JAL-3631 Allow override of appDataPath with property 'setuserappdirpath' substituting %h, %u and a leading ~/
Ben Soares [Wed, 17 Jul 2024 15:31:01 +0000 (16:31 +0100)]
JAL-3631 Extensive working of options in install4j for allowing/disabling user default appdir updates, and also allowing/disabling installation appdir updates. Appropriate guidance in tooltips and warnings when no updates will occur are given. A user-space install only allows disabling updates.
Jim Procter [Fri, 12 Jul 2024 16:58:43 +0000 (17:58 +0100)]
shorter hashes - just first seven characters.. like in git
Jim Procter [Fri, 12 Jul 2024 16:41:38 +0000 (17:41 +0100)]
JAL-3631 updated getdown jars
Jim Procter [Fri, 12 Jul 2024 16:40:46 +0000 (17:40 +0100)]
JAL-3631 - report that an additional flag might be needed if we didn't manage to get an appDir
Jim Procter [Fri, 12 Jul 2024 16:38:59 +0000 (17:38 +0100)]
JAL-3631 shorter digest string for the unique user app dir
Jim Procter [Fri, 12 Jul 2024 16:38:26 +0000 (17:38 +0100)]
JAL-3631 check we actually created EnvConfig!
Jim Procter [Fri, 12 Jul 2024 14:24:47 +0000 (15:24 +0100)]
JAL-3631 updated getdown jars
Jim Procter [Fri, 12 Jul 2024 13:17:35 +0000 (14:17 +0100)]
JAL-3631 insert digest of full path to installer.appdir in path for user appdir and add tests to verify nouserdefaultappdir clobbers userdefaultappdir
Jim Procter [Wed, 3 Jul 2024 19:56:00 +0000 (20:56 +0100)]
JAL-3631 rebuild getdown jars after merge to develop
Jim Procter [Wed, 3 Jul 2024 19:16:18 +0000 (20:16 +0100)]
Merge branch 'feature/JAL-3631_allow_jalview_to_work_from_user-space_directory' into develop
Ben Soares [Mon, 1 Jul 2024 01:05:40 +0000 (02:05 +0100)]
JAL-3631 Slightly larger wizard
Ben Soares [Mon, 1 Jul 2024 01:05:00 +0000 (02:05 +0100)]
JAL-3631 Harden defence against looping getdown relaunches. Null checked in HttpUtils. Remove unnecessary code in getdown
Ben Soares [Sat, 29 Jun 2024 21:53:27 +0000 (22:53 +0100)]
JAL-3631 JVL file with appbase now relaunches getdown
Ben Soares [Fri, 28 Jun 2024 17:18:51 +0000 (18:18 +0100)]
JAL-3631 Made an isAdmin flag to work in Windows Admin mode installation
Ben Soares [Fri, 28 Jun 2024 17:18:12 +0000 (18:18 +0100)]
JAL-3830 Added some quotation marks to jalview.bat for folders with spaces
Ben Soares [Fri, 28 Jun 2024 16:04:09 +0000 (17:04 +0100)]
JAL-3631 Remove the checkboxes from the Finish screen. Now moved to pre-install screen.
Ben Soares [Fri, 28 Jun 2024 15:53:52 +0000 (16:53 +0100)]
JAL-3631 Group USERSPACE and SYSTEMSPACE tasks (and other groups of tasks) together for neatness
Ben Soares [Fri, 28 Jun 2024 15:53:16 +0000 (16:53 +0100)]
JAL-3631 Change in user path for locally installed Jalview to avoid collision with old installation. Tidy a null check for Java Console output
Ben Soares [Fri, 28 Jun 2024 11:30:01 +0000 (12:30 +0100)]
JAL-3631 Change to Windows user-space default location, now same as default installation location
Ben Soares [Fri, 28 Jun 2024 11:04:50 +0000 (12:04 +0100)]
JAL-3631 Fixed a getdown Exception when launching Jalview in windows
Ben Soares [Fri, 28 Jun 2024 11:04:05 +0000 (12:04 +0100)]
JAL-3631 Adjustments to the Windows installer
Ben Soares [Thu, 27 Jun 2024 23:37:42 +0000 (00:37 +0100)]
JAL-3631 spelling correction
Ben Soares [Thu, 27 Jun 2024 21:15:41 +0000 (22:15 +0100)]
JAL-3631 Installers with separate actions for user/administrator installation
Ben Soares [Thu, 27 Jun 2024 21:14:58 +0000 (22:14 +0100)]
JAL-3631 Add property to let log4j know we're not running in a servlet (or it issues a warning which breaks cli headless output)
Ben Soares [Thu, 27 Jun 2024 16:46:47 +0000 (17:46 +0100)]
JAL-3631 Log4j logging to .jalview.log file when requested. Clean(ish) handover of log file from getdown to jalview.
Ben Soares [Tue, 25 Jun 2024 22:13:55 +0000 (23:13 +0100)]
JAL-3631 JAL-3384 Install4j launch now redirects STDOUT/STDERR to ~/.jalview_develop.log and passes the file on to getdown and Jalview which will also now log to this file. Single log file.
Ben Soares [Tue, 25 Jun 2024 10:31:17 +0000 (11:31 +0100)]
JAL-3631 Use the icon file passed by install4j if a newer getdown-launcher is relaunched
Ben Soares [Tue, 25 Jun 2024 10:30:38 +0000 (11:30 +0100)]
JAL-3631 Allow icon file name to be passed to launcher by install4j
Ben Soares [Tue, 25 Jun 2024 09:22:42 +0000 (10:22 +0100)]
JAL-3631 Forgot to add this file for 'Change parity of comparison for convention' commit
Ben Soares [Tue, 25 Jun 2024 08:55:45 +0000 (09:55 +0100)]
JAL-3631 Tests for version comparisons and Jar version comparisons and Jar version checking
Ben Soares [Tue, 25 Jun 2024 08:49:23 +0000 (09:49 +0100)]
JAL-3631 Change parity of comparison for convention
Ben Soares [Mon, 24 Jun 2024 23:23:37 +0000 (00:23 +0100)]
JAL-3631 Report getCanonicalPath for installer appdir
Ben Soares [Mon, 24 Jun 2024 23:23:00 +0000 (00:23 +0100)]
JAL-3631 Check Implementation-Version of getdown-launcher.jar in installation appdir and user's appdir, and only use the user one if it's newer. Remove content digest check for getdown-launcher.jar comparison since version now being checked.
Ben Soares [Fri, 21 Jun 2024 17:15:02 +0000 (18:15 +0100)]
JAL-3631 updated getdown jars
Ben Soares [Fri, 21 Jun 2024 15:04:11 +0000 (16:04 +0100)]
Merge branch 'develop' into feature/JAL-3631_allow_jalview_to_work_from_user-space_directory
Ben Soares [Fri, 21 Jun 2024 15:03:23 +0000 (16:03 +0100)]
JAL-3631 Changed label for consistency
Jim Procter [Fri, 21 Jun 2024 14:26:03 +0000 (15:26 +0100)]
Merge branch 'improvement/JAL-4409_implement_extra_schemes_in_getdown' into develop
Ben Soares [Fri, 21 Jun 2024 12:49:25 +0000 (13:49 +0100)]
Merge branch 'improvement/JAL-4409_implement_extra_schemes_in_getdown' into feature/JAL-3631_allow_jalview_to_work_from_user-space_directory
Ben Soares [Fri, 21 Jun 2024 12:48:41 +0000 (13:48 +0100)]
JAL-4409 Add two empty args to getdown call from install4j for backward compatibility, and further arguments such as JVL file. Improve handling of a JVL file with an appbase in it.
Ben Soares [Fri, 21 Jun 2024 09:00:08 +0000 (10:00 +0100)]
JAL-4409 Don't merge JVL configs when changing appbase
Ben Soares [Thu, 20 Jun 2024 18:27:41 +0000 (19:27 +0100)]
JAL-4409 Use fixed 'latest' artifact URL
Ben Soares [Thu, 20 Jun 2024 17:39:13 +0000 (18:39 +0100)]
JAL-4409 Changes in BUILD channel appbase to tie in with Getdown DEVELOP Launcher build plan
Ben Soares [Thu, 20 Jun 2024 09:12:03 +0000 (10:12 +0100)]
JAL-3631 Now sending launcher.appdir from within getdown
Ben Soares [Wed, 19 Jun 2024 12:35:09 +0000 (13:35 +0100)]
JAL-3631 Rename/rationalise informational system property names. Re-order display of information on Java Console. Supply info from authoratitive sources (getdown-launcher.jar rather than gradle.properties).
Ben Soares [Tue, 18 Jun 2024 22:52:25 +0000 (23:52 +0100)]
JAL-3631 macos dev install script incorporated into dev_install.sh
Ben Soares [Tue, 18 Jun 2024 22:38:09 +0000 (23:38 +0100)]
JAL-4358 slight improvement to detecting desktop creation to close getdown splash screen
Ben Soares [Tue, 18 Jun 2024 20:37:20 +0000 (21:37 +0100)]
JAL-3631 gradle-build-and-re-install script, works with macOS or Linux
Ben Soares [Tue, 18 Jun 2024 20:36:44 +0000 (21:36 +0100)]
JAL-3631 Substantial additions to Getdown (through jalview.util.LaunchUtils) to re-launch getdown-launcher.jar when the user's version differs from the installed version. install4j vmoptions file allows administrator to prevent any automatic updates.
Ben Soares [Mon, 17 Jun 2024 09:45:38 +0000 (10:45 +0100)]
JAL-3631 Allow quick deployment of gradle build on linux and macos
Ben Soares [Fri, 14 Jun 2024 19:53:04 +0000 (20:53 +0100)]
Merge branch 'develop' into feature/JAL-3631_allow_jalview_to_work_from_user-space_directory
Ben Soares [Fri, 14 Jun 2024 17:51:40 +0000 (18:51 +0100)]
JAL-3631 Got rid of the USER_EXECUTABLE_NAME as it's no longer needed since getting rid of the old Launcher in install4j
Ben Soares [Fri, 14 Jun 2024 17:37:28 +0000 (18:37 +0100)]
JAL-3631 Removed old non-user launcher. Labelled USERSPACE actions.
Ben Soares [Fri, 14 Jun 2024 17:36:45 +0000 (18:36 +0100)]
JAL-3631 JAL-4104 More consistent system property names passing through getdown. Add nousedefaultappdir property to allow non-updating system installation of Jalview.
Ben Soares [Fri, 14 Jun 2024 09:40:37 +0000 (10:40 +0100)]
JAL-3631 Allow -Pinstall4j_build_ids=MACOS-AARCH64-DMG for specific installer build. Fix installer icons (PNGs and paths).
Ben Soares [Thu, 13 Jun 2024 20:20:54 +0000 (21:20 +0100)]
JAL-3845 Add a popup error message, with instructions, when Jalview launched from the Installer Volume
Ben Soares [Thu, 13 Jun 2024 20:20:06 +0000 (21:20 +0100)]
JAL-3631 New Installer icons. Getdown check that the application appdir is different from the user default appdir before copying files. Also copy gedown-launcher.jar.
Ben Soares [Wed, 12 Jun 2024 22:23:03 +0000 (23:23 +0100)]
JAL-3631 Name changes to system properties and a fallback App name to avoid hard-coded name in getdown
Ben Soares [Wed, 12 Jun 2024 22:22:17 +0000 (23:22 +0100)]
JAL-3631 Spot system property triggers in getdown to create/activate using a user-space location (dependent on OS), and copy digest-tested files from the Application's app dir to the user's new app dir. Debugging statements left in for testing on other OSes.
Ben Soares [Wed, 12 Jun 2024 22:18:43 +0000 (23:18 +0100)]
JAL-3631 Add a new launcher in install4j to pass new system properties to getdown, triggering the user-space appdir creation
Ben Soares [Mon, 10 Jun 2024 19:23:13 +0000 (20:23 +0100)]
Merge branch 'bug/JAL-4421_customise_volume_name_of_DMG_installers' into feature/JAL-3631_allow_jalview_to_work_from_user-space_directory
Jim Procter [Mon, 10 Jun 2024 13:18:31 +0000 (14:18 +0100)]
JAL-4159 remove errant jalview source .zip
Ben Soares [Fri, 7 Jun 2024 13:10:14 +0000 (14:10 +0100)]
Merge branch 'develop' into improvement/JAL-4409_implement_extra_schemes_in_getdown
Ben Soares [Fri, 7 Jun 2024 11:20:40 +0000 (12:20 +0100)]
JAL-4421 Update the dev_masos_installer.sh to use new Volume name
Ben Soares [Thu, 6 Jun 2024 19:08:18 +0000 (20:08 +0100)]
JAL-4420 Added some more filename extensions
Ben Soares [Thu, 6 Jun 2024 12:54:51 +0000 (13:54 +0100)]
JAL-4072 Add zip-slip check in getdown
Jim Procter [Thu, 6 Jun 2024 10:49:13 +0000 (11:49 +0100)]
Merge branch 'bug/JAL-4421_customise_volume_name_of_DMG_installers' into develop
Ben Soares [Thu, 6 Jun 2024 10:17:41 +0000 (11:17 +0100)]
JAL-4358 Add the JALVIEW: CREATED DESKTOP line to java app and look out for it in Getdown to close the splash screen
Ben Soares [Wed, 5 Jun 2024 20:20:32 +0000 (21:20 +0100)]
JAL-4420 Allow associated files to be dragged on separately from the alignment (but afterwards).
Ben Soares [Wed, 5 Jun 2024 19:39:27 +0000 (20:39 +0100)]
JAL-4409 Small refactoring of ArgParserUtils to allow processFiles to work on drag-and-dropped files list.
Ben Soares [Wed, 5 Jun 2024 14:03:52 +0000 (15:03 +0100)]
Merge branch 'develop' into bug/JAL-4421_customise_volume_name_of_DMG_installers
Ben Soares [Wed, 5 Jun 2024 13:17:38 +0000 (14:17 +0100)]
JAL-4421 Downgrading ds_store to 1.3.0 for build server limitations
Ben Soares [Wed, 5 Jun 2024 00:28:20 +0000 (01:28 +0100)]
JAL-4421 Configuration for positioning icons in DMG
Ben Soares [Wed, 5 Jun 2024 00:27:24 +0000 (01:27 +0100)]
JAL-4421 Add --appname --appxpos --appypos to position variable application name icons, or read from config[app]
Ben Soares [Tue, 4 Jun 2024 20:39:55 +0000 (21:39 +0100)]
JAL-4421 Remove the disk_image_alias from the backgroundImageAlias altogether as it isn't needed and doesn't even make sense for a downloaded DMG
Ben Soares [Tue, 4 Jun 2024 17:35:53 +0000 (18:35 +0100)]
JAL-4421 Allow JSON config file to be options (no icon positioning for default or develop-SUFFIX). Allow .VolumeIcons.icns to be optional -- must remove <file> node from install4j template
Jim Procter [Tue, 4 Jun 2024 15:52:20 +0000 (16:52 +0100)]
Merge branch 'improvement/JAL-4409_implement_extra_schemes_in_getdown' into develop
Jim Procter [Tue, 4 Jun 2024 15:45:04 +0000 (16:45 +0100)]
JAL-4409 don't ignore gitignore !
Jim Procter [Tue, 4 Jun 2024 15:35:40 +0000 (16:35 +0100)]
JAL-4418 first development release for 2.11.4.0 - release notes for
JAL-4159,JAL-4257,JAL-4386,JAL-4392,JAL-789
Jim Procter [Tue, 4 Jun 2024 15:08:26 +0000 (16:08 +0100)]
Merge branch 'feature/JAL-4159_pasimap' into develop
Conflicts:
help/markdown/releases/release-2_11_3_0.md
Jim Procter [Tue, 4 Jun 2024 15:05:57 +0000 (16:05 +0100)]
Merge branch 'releases/Release_2_11_3_Branch' into develop
Ben Soares [Tue, 4 Jun 2024 00:50:02 +0000 (01:50 +0100)]
JAL-4421 Put correct VolumeIcon.icns file onto DMG volume as /.VolumeIcon.icns
Ben Soares [Mon, 3 Jun 2024 23:50:05 +0000 (00:50 +0100)]
JAL-4421 Icns to use as .VolumeIcon.icns in DMG volumes. See comment with SetFile
Ben Soares [Mon, 3 Jun 2024 18:13:40 +0000 (19:13 +0100)]
JAL-4421 Also add DMG filename to python script. Necessitates DS_Store for x64 and aarch64 versions, with changes in build.gradle and install4j10_template.install4j. Ensure all x64 references are x64 and not the (more correct) x86 -- java uses x64.