From 892fbc34437c79d7be89a50eaf495e79a73a1c60 Mon Sep 17 00:00:00 2001 From: hinerm Date: Tue, 21 May 2024 17:26:03 -0500 Subject: [PATCH] Move known Fiji Java path to jvm.toml Aggregated values are currently prepended, thus declaring a root diretcory in fiji.toml takes precedence over ALL paths in jvm.toml, making it impossible to update the Java version on x64 Mac in Fijis with a bundled JVM. See https://github.com/apposed/jaunch/issues/49 --- configs/fiji.toml | 6 ------ configs/jvm.toml | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configs/fiji.toml b/configs/fiji.toml index c1a907b..518de85 100644 --- a/configs/fiji.toml +++ b/configs/fiji.toml @@ -118,12 +118,6 @@ python.main-args = [ # | JAVA CONFIG | # \============================================================================/ -jvm.root-paths = [ - # Fiji used to ship versions of OpenJDK 8 with a mangled directory structure. - # The mangling was done to work around limitations of the old ImageJ Launcher. - '!--system|OS:MACOSX|ARCH:X64|${app-dir}/java/macosx/*/jre/Contents/Home', -] - jvm.version-min = '8' jvm.classpath = [ diff --git a/configs/jvm.toml b/configs/jvm.toml index 7d53d68..6576725 100644 --- a/configs/jvm.toml +++ b/configs/jvm.toml @@ -422,6 +422,9 @@ jvm.root-paths = [ '!--system|OS:MACOSX|ARCH:ARM64|${app-dir}/java/macosx-arm64/*', # bundled (macOS aarch64) '!--system|OS:MACOSX|ARCH:X64|${app-dir}/java/macosx/*/Contents/Home', # bundled (macOS x86-64) '!--system|OS:MACOSX|ARCH:X64|${app-dir}/java/macosx/*', # bundled (macOS x86-64) + # Fiji used to ship versions of OpenJDK 8 with a mangled directory structure. + # The mangling was done to work around limitations of the old ImageJ Launcher. + '!--system|OS:MACOSX|ARCH:X64|${app-dir}/java/macosx/*/jre/Contents/Home', '!--system|OS:WINDOWS|ARCH:X64|${app-dir}/java\win64\*', # bundled (Windows x86-64) '!--system|OS:WINDOWS|ARCH:X86|${app-dir}/java\win32\*', # bundled (Windows x86-32) '${CONDA_PREFIX}/pkgs/openjdk*/lib/jvm', # Conda (openjdk 9+)