Skip to content

Commit

Permalink
Move known Fiji Java path to jvm.toml
Browse files Browse the repository at this point in the history
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 #49
  • Loading branch information
hinerm committed May 21, 2024
1 parent e084a5b commit 892fbc3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 0 additions & 6 deletions configs/fiji.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
3 changes: 3 additions & 0 deletions configs/jvm.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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+)
Expand Down

0 comments on commit 892fbc3

Please sign in to comment.