diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-02 08:59:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-02 08:59:01 (GMT) |
| commit | 7f513ab3af116a0d77cc0cd829993edd3a570b50 (patch) | |
| tree | b6eee515cd228ae5e50922c6d24c0a1283fcb7f2 /library | |
| parent | 80c6ce4fdfa68fe2ba9fa9795f0260f1b2018b99 (diff) | |
| parent | 6e97fd01b017aa32b07924c1ed080c27941664fd (diff) | |
| download | tcl-7f513ab3af116a0d77cc0cd829993edd3a570b50.zip tcl-7f513ab3af116a0d77cc0cd829993edd3a570b50.tar.gz tcl-7f513ab3af116a0d77cc0cd829993edd3a570b50.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'library')
| -rw-r--r-- | library/manifest.txt | 2 | ||||
| -rw-r--r-- | library/platform/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/platform/platform.tcl | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/library/manifest.txt b/library/manifest.txt index 0a516b1..08529da 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.16 {platform platform.tcl} + 0 platform 1.0.17 {platform platform.tcl} 0 platform::shell 1.1.4 {platform shell.tcl} 1 tcltest 2.5.4 {tcltest tcltest.tcl} } { diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl index 401300a..7983831 100644 --- a/library/platform/pkgIndex.tcl +++ b/library/platform/pkgIndex.tcl @@ -1,3 +1,3 @@ -package ifneeded platform 1.0.16 [list source [file join $dir platform.tcl]] +package ifneeded platform 1.0.17 [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 2c83102..e01334e 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -29,8 +29,10 @@ # are on "Windows NT" or "Windows XP" or whatever. # # Machine specific +# % amd64 -> x86_64 # % arm* -> arm # % sun4* -> sparc +# % ia32* -> ix86 # % intel -> ix86 # % i*86* -> ix86 # % Power* -> powerpc @@ -81,6 +83,7 @@ proc ::platform::generic {} { set cpu ix86 } } + ppc - "Power*" { set cpu powerpc } @@ -177,8 +180,9 @@ proc ::platform::identify {} { macosx { set major [lindex [split $tcl_platform(osVersion) .] 0] if {$major > 19} { - incr major -20 - append plat 11.$major + set minor [lindex [split $tcl_platform(osVersion) .] 1] + incr major -9 + append plat $major.[expr {$minor - 1}] } else { incr major -4 append plat 10.$major @@ -405,7 +409,7 @@ proc ::platform::patterns {id} { # ### ### ### ######### ######### ######### ## Ready -package provide platform 1.0.16 +package provide platform 1.0.17 # ### ### ### ######### ######### ######### ## Demo application |