<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/524ab0b13590fd168b3575fad92d1ca67d36afd6">https://github.com/macports/macports-ports/commit/524ab0b13590fd168b3575fad92d1ca67d36afd6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 524ab0b13590fd168b3575fad92d1ca67d36afd6
</span>Author: Janosch Peters <janosch1@mailbox.org>
AuthorDate: Thu Aug 26 13:24:00 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> java-pg: Remove java-specific names in generic functions
</span>---
_resources/port1.0/group/java-1.0.tcl | 54 ++++++++++++++++++++++++-----------
1 file changed, 37 insertions(+), 17 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 a5e31928be1..1a9c0e01ef8 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;'>@@ -148,7 +148,9 @@ proc get_jvm_bigsur { version_requested } {
</span> }
# Find JVM versions by using /usr/libexec/java_home -V (not -v!)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Returns a dict of unique(!) major versions [major_version path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Returns a dict with unique major versions as key and the corresponding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# java_home as value:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# dict[major_version]=java_home
</span> proc find_jvm_versions {} {
if {[catch {exec /usr/libexec/java_home -V} result options]} {
# Extract JVM versions and corresponding JAVA_HOMEs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,33 +185,51 @@ proc match_jvm_version { version_requested versions_found } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc match_equal { version version_list } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach vl_item [dict keys $version_list] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$version == $vl_item} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set java_home [dict get $version_list $vl_item]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $java_home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Returns the value of the first dictionary entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# whose key is equal to search_key.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @param search_key The key that is to be found in the dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @param target_dict The dictionary which should be searched for search_key
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @return The value of the first entry that matched.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Returns an error, if no such entry is found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc match_equal { search_key target_dict } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach td_key [dict keys $target_dict] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$search_key == $td_key} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ret_value [dict get $target_dict $td_key]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $ret_value
</span> }
}
return -code error
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc match_less_equal { version version_list } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach vl_item [dict keys $version_list] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$version <= $vl_item} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set java_home [dict get $version_list $vl_item]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $java_home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Returns the value of the first dictionary entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# whose key is less or equal to search_key.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @param search_key The key that is to be found in the dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @param target_dict The dictionary which should be searched for search_key
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @return The value of the first entry that matched.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Returns an error, if no such entry is found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc match_less_equal { search_key target_dict } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach td_key [dict keys $target_dict] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$search_key <= $td_key} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ret_value [dict get $target_dict $td_key]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $ret_value
</span> }
}
return -code error
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Sorts a dictionary decreasing by its keys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @param The dictionary that is to be sorted decreasing by its keys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @return A sorted dictionary
</span> proc sort_dict { unsorted_dict } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set dkeys [dict keys $unsorted_dict]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dkeys_sorted [lsort -decreasing $dkeys]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set keys_unsorted [dict keys $unsorted_dict]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set keys_sorted [lsort -decreasing $keys_unsorted]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach place $dkeys_sorted {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jvm_path [dict get $unsorted_dict $place]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict append version_path_dict $place $jvm_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach key $keys_sorted {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set value [dict get $unsorted_dict $key]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict append sorted_dict $key $value
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return $version_path_dict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $sorted_dict
</span> }
</pre><pre style='margin:0'>
</pre>