From aa6bf4e80b76e982484466939bd7b8845e1b3731 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 18 Aug 2025 13:23:27 +0000 Subject: platform version => 1.0.20 --- library/platform/pkgIndex.tcl | 2 +- library/platform/platform.tcl | 2 +- unix/Makefile.in | 4 ++-- win/Makefile.in | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl index 4526c7e..20750be 100644 --- a/library/platform/pkgIndex.tcl +++ b/library/platform/pkgIndex.tcl @@ -1,3 +1,3 @@ -package ifneeded platform 1.0.19 [list source -encoding utf-8 [file join $dir platform.tcl]] +package ifneeded platform 1.0.20 [list source -encoding utf-8 [file join $dir platform.tcl]] package ifneeded platform::shell 1.1.4 [list source -encoding utf-8 [file join $dir shell.tcl]] diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index 4988fbd..b142ed1 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -466,7 +466,7 @@ proc ::platform::patterns {id} { # ### ### ### ######### ######### ######### ## Ready -package provide platform 1.0.19 +package provide platform 1.0.20 # ### ### ### ######### ######### ######### ## Demo application diff --git a/unix/Makefile.in b/unix/Makefile.in index 3efdfec..886606d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -875,9 +875,9 @@ install-libraries: libraries @echo "Installing package tcltest 2.5.10 as a Tcl Module" @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \ "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.10.tm" - @echo "Installing package platform 1.0.19 as a Tcl Module" + @echo "Installing package platform 1.0.20 as a Tcl Module" @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \ - "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm" + "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.20.tm" @echo "Installing package platform::shell 1.1.4 as a Tcl Module" @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \ "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm" diff --git a/win/Makefile.in b/win/Makefile.in index 6b06e2e..4daa827 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -758,8 +758,8 @@ install-libraries: libraries install-tzdata install-msgs @$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"; @echo "Installing package tcltest 2.5.10 as a Tcl Module"; @$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.10.tm"; - @echo "Installing package platform 1.0.19 as a Tcl Module"; - @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm"; + @echo "Installing package platform 1.0.20 as a Tcl Module"; + @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.20.tm"; @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; @$(COPY) $(ROOT_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"; @echo "Installing encodings"; -- cgit v0.12 From f963e962594b9a669b77981bae65fa865eca2934 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 18 Aug 2025 13:27:23 +0000 Subject: Update changes --- changes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/changes b/changes index 906130c..2639fc3 100644 --- a/changes +++ b/changes @@ -9419,4 +9419,7 @@ Many code fixes to avoid overflow or undefined behavior. Thanks chrstphrchvz. - Released 8.6.17, Aug 15, 2025 - details at https://core.tcl-lang.org/tcl/ - -- (to be) Released 8.6.17, Apr ??, 2026 - details at https://core.tcl-lang.org/tcl/ - +2025-08-18 (new) support for MacOS Tahoe (nijtmans) + => platform 1.0.20 + +- (to be) Released 8.6.18, Apr ??, 2026 - details at https://core.tcl-lang.org/tcl/ - -- cgit v0.12 From b166c166e76a0d2ec5d49f94b6fba90385eabab2 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 18 Aug 2025 13:56:44 +0000 Subject: Assume that - one day - MacOS 26.5 will be there --- library/platform/platform.tcl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index b142ed1..8e97b94 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -366,6 +366,17 @@ proc ::platform::patterns {id} { foreach {major minor} [split $v .] break set res {} + if {$major gt 26} { + # Add x.0 to x.minor to patterns. + for {set j $minor} {$j >= 0} {incr j -1} { + lappend res macosx${major}.${j}-${cpu} + foreach a $alt { + lappend res macosx${major}.${j}-$a + } + } + incr major -1 + set minor 5; # Assume that (major-1).5 will be there one day. + } if {$major eq 26} { # Add 26.0 to 26.minor to patterns. for {set j $minor} {$j >= 0} {incr j -1} { -- cgit v0.12 From a43258ca2779c25a13c9bf9fd4199a3c1fcafd3d Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 18 Aug 2025 14:08:34 +0000 Subject: Let's not break it with Tcl 8.5 --- library/platform/platform.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index 8e97b94..5a1a811 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -366,7 +366,7 @@ proc ::platform::patterns {id} { foreach {major minor} [split $v .] break set res {} - if {$major gt 26} { + if {$major ge 27} { # Add x.0 to x.minor to patterns. for {set j $minor} {$j >= 0} {incr j -1} { lappend res macosx${major}.${j}-${cpu} -- cgit v0.12 From 97e33af67f4179e1b17af0ed4801444034a917db Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 18 Aug 2025 14:18:53 +0000 Subject: Oops, shouldn't use string compare here --- library/platform/platform.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index 5a1a811..e6aeab1 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -366,7 +366,7 @@ proc ::platform::patterns {id} { foreach {major minor} [split $v .] break set res {} - if {$major ge 27} { + if {$major > 26} { # Add x.0 to x.minor to patterns. for {set j $minor} {$j >= 0} {incr j -1} { lappend res macosx${major}.${j}-${cpu} -- cgit v0.12 From 88f4b5757c89a525b25ca6834e954931bd4c00b2 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 18 Aug 2025 21:49:35 +0000 Subject: Minor corrections, handle Tcl 9 platform reductions --- library/platform/platform.tcl | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index e6aeab1..3bf1ff6 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -185,7 +185,10 @@ proc ::platform::identify {} { if {$major < 26} { incr major -10 } - append plat $major.[expr {$minor - 1}] + if {$major < 14} { + incr minor -1 + } + append plat $major.$minor } else { incr major -4 append plat 10.$major @@ -386,7 +389,7 @@ proc ::platform::patterns {id} { } } set major 15 - set minor 7 + set minor 6 } if {$major eq 15} { # Add 15.0 to 15.minor to patterns. @@ -397,7 +400,7 @@ proc ::platform::patterns {id} { } } set major 14 - set minor 8 + set minor 6 } if {$major eq 14} { # Add 14.0 to 14.minor to patterns. @@ -408,7 +411,7 @@ proc ::platform::patterns {id} { } } set major 13 - set minor 7 + set minor 5 } if {$major eq 13} { # Add 13.0 to 13.minor to patterns. @@ -419,7 +422,7 @@ proc ::platform::patterns {id} { } } set major 12 - set minor 7 + set minor 5 } if {$major eq 12} { # Add 12.0 to 12.minor to patterns. @@ -443,8 +446,8 @@ proc ::platform::patterns {id} { set major 10 set minor 15 } - # Add 10.5 to 10.minor to patterns. - for {set j $minor} {$j >= 5} {incr j -1} { + # Add 10.9 to 10.minor to patterns. + for {set j $minor} {$j >= 9} {incr j -1} { if {$cpu ne "arm"} { lappend res macosx${major}.${j}-${cpu} } @@ -452,11 +455,21 @@ proc ::platform::patterns {id} { lappend res macosx${major}.${j}-$a } } - - # Add unversioned patterns for 10.3/10.4 builds. - lappend res macosx-${cpu} - foreach a $alt { - lappend res macosx-$a + if {![package vsatisfies [package provide Tcl] 9.0-]} { + # Continue up to 10.5. + for {} {$j >= 5} {incr j -1} { + if {$cpu ne "arm"} { + lappend res macosx${major}.${j}-${cpu} + } + foreach a $alt { + lappend res macosx${major}.${j}-$a + } + } + # Add unversioned patterns for 10.3/10.4 builds. + lappend res macosx-${cpu} + foreach a $alt { + lappend res macosx-$a + } } } else { # No version, just do unversioned patterns. -- cgit v0.12