diff options
| author | kjnash <k.j.nash@usa.net> | 2022-10-26 12:35:18 (GMT) |
|---|---|---|
| committer | kjnash <k.j.nash@usa.net> | 2022-10-26 12:35:18 (GMT) |
| commit | 1e0a98c9aa064a2472cb7a62b51b86252528782b (patch) | |
| tree | e8abd26b5fc9a3e83614c3d3a01290eb551939f4 /library | |
| parent | 2ecf92f50b4fad000f8cf4b368ce47c6035bdf4c (diff) | |
| parent | 42b1c587058185cf982966c733806b5d6dd8625d (diff) | |
| download | tcl-1e0a98c9aa064a2472cb7a62b51b86252528782b.zip tcl-1e0a98c9aa064a2472cb7a62b51b86252528782b.tar.gz tcl-1e0a98c9aa064a2472cb7a62b51b86252528782b.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'library')
| -rw-r--r-- | library/install.tcl | 6 | ||||
| -rw-r--r-- | library/manifest.txt | 2 | ||||
| -rw-r--r-- | library/platform/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/platform/platform.tcl | 13 |
4 files changed, 17 insertions, 6 deletions
diff --git a/library/install.tcl b/library/install.tcl index ce8e80b..50e40df 100644 --- a/library/install.tcl +++ b/library/install.tcl @@ -35,7 +35,7 @@ proc ::practcl::_pkgindex_directory {path} { # Read the file, and override assumptions as needed ### set fin [open $file r] - fconfigure $fin -encoding utf-8 -eofchar "\032 {}" + fconfigure $fin -encoding utf-8 -eofchar "\x1A {}" set dat [read $fin] close $fin # Look for a teapot style Package statement @@ -59,7 +59,7 @@ proc ::practcl::_pkgindex_directory {path} { foreach file [glob -nocomplain $path/*.tcl] { if { [file tail $file] == "version_info.tcl" } continue set fin [open $file r] - fconfigure $fin -encoding utf-8 -eofchar "\032 {}" + fconfigure $fin -encoding utf-8 -eofchar "\x1A {}" set dat [read $fin] close $fin if {![regexp "package provide" $dat]} continue @@ -79,7 +79,7 @@ proc ::practcl::_pkgindex_directory {path} { return $buffer } set fin [open $pkgidxfile r] - fconfigure $fin -encoding utf-8 -eofchar "\032 {}" + fconfigure $fin -encoding utf-8 -eofchar "\x1A {}" set dat [read $fin] close $fin set trace 0 diff --git a/library/manifest.txt b/library/manifest.txt index b425920..6d999e8 100644 --- a/library/manifest.txt +++ b/library/manifest.txt @@ -10,7 +10,7 @@ apply {{dir} { 1 opt 0.4.8 {opt optparse.tcl} 0 cookiejar 0.2.0 {cookiejar cookiejar.tcl} 0 tcl::idna 1.0.1 {cookiejar idna.tcl} - 0 platform 1.0.18 {platform platform.tcl} + 0 platform 1.0.19 {platform platform.tcl} 0 platform::shell 1.1.4 {platform shell.tcl} 1 tcltest 2.5.5 {tcltest tcltest.tcl} } { diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl index de28fd1..e7029d0 100644 --- a/library/platform/pkgIndex.tcl +++ b/library/platform/pkgIndex.tcl @@ -1,3 +1,3 @@ -package ifneeded platform 1.0.18 [list source [file join $dir platform.tcl]] +package ifneeded platform 1.0.19 [list source [file join $dir platform.tcl]] package ifneeded platform::shell 1.1.4 [list source [file join $dir shell.tcl]] diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index 752f069..acaebf2 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -364,6 +364,17 @@ proc ::platform::patterns {id} { foreach {major minor} [split $v .] break set res {} + if {$major eq 13} { + # Add 13.0 to 13.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 + } + } + set major 12 + set minor 5 + } if {$major eq 12} { # Add 12.0 to 12.minor to patterns. for {set j $minor} {$j >= 0} {incr j -1} { @@ -420,7 +431,7 @@ proc ::platform::patterns {id} { # ### ### ### ######### ######### ######### ## Ready -package provide platform 1.0.18 +package provide platform 1.0.19 # ### ### ### ######### ######### ######### ## Demo application |