<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a27ae647bb426cfdd883f02366e38d9c87e2f139">https://github.com/macports/macports-ports/commit/a27ae647bb426cfdd883f02366e38d9c87e2f139</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a27ae647bb426cfdd883f02366e38d9c87e2f139
</span>Author: Janosch Peters <janosch1@mailbox.org>
AuthorDate: Thu Aug 26 13:24:57 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> java-pg: Prefix debug messages with 'java-pg'
</span>---
_resources/port1.0/group/java-1.0.tcl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/java-1.0.tcl b/_resources/port1.0/group/java-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a9c0e01ef8..67d028f396f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/java-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/java-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +50,7 @@ proc find_java_home {} {
</span>
global java.version java.fallback
if { ${java.version} ne "" } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "java-portgroup: Trying to find JVM version: ${java.version}"
</span>
# If on arm automatically adjust to the *-zulu fallback versions
# as required, as currently these are the only ones supporting arm.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +81,7 @@ proc find_java_home {} {
</span> set java_version_not_found yes
} else {
set home_value $val
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Discovered JAVA_HOME via /usr/libexec/java_home: $home_value"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "java-portgroup: Discovered matching JAVA_HOME: $home_value"
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +142,7 @@ proc get_jvm_bigsur { version_requested } {
</span> set version_requested [regsub {^1\.} $version_requested ""]
# Sort the JVMs we found on the system descending
set versions_found [sort_dict [find_jvm_versions]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Big Sur Workaround - Detected JVMs: $versions_found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "java-portgroup: Detected JVMs: $versions_found"
</span> # Match the systems JVMs with the one requested by MacPorts
# Higher JVM Versions win
return [match_jvm_version $version_requested $versions_found]
</pre><pre style='margin:0'>
</pre>