diff options
Diffstat (limited to 'library')
| -rw-r--r-- | library/auto.tcl | 12 | ||||
| -rw-r--r-- | library/dde/pkgIndex.tcl | 6 | ||||
| -rw-r--r-- | library/init.tcl | 8 | ||||
| -rwxr-xr-x | library/reg/pkgIndex.tcl | 9 | ||||
| -rw-r--r-- | library/tm.tcl | 6 |
5 files changed, 21 insertions, 20 deletions
diff --git a/library/auto.tcl b/library/auto.tcl index 97ea8af..346679d 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -46,7 +46,7 @@ proc auto_reset {} { # # Arguments: # basename Prefix of the directory name, (e.g., "tk") -# version Version number of the package, (e.g., "8.0") +# version Version number of the package, (e.g., "8") # patch Patchlevel of the package, (e.g., "8.0.3") # initScript Initialization script to source (e.g., tk.tcl) # enVarName environment variable to honor (e.g., TK_LIBRARY) @@ -94,8 +94,8 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { } # 3. Various locations relative to the executable - # ../lib/foo1.0 (From bin directory in install hierarchy) - # ../../lib/foo1.0 (From bin/arch directory in install hierarchy) + # ../share/foo1.0 (From bin directory in install hierarchy) + # ../../share/foo1.0 (From bin/arch directory in install hierarchy) # ../library (From unix directory in build hierarchy) # # Remaining locations are out of date (when relevant, they ought to be @@ -109,8 +109,10 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { set parentDir [file dirname [file dirname [info nameofexecutable]]] set grandParentDir [file dirname $parentDir] - lappend dirs [file join $parentDir lib $basename$version] - lappend dirs [file join $grandParentDir lib $basename$version] + lappend dirs [file join $parentDir share $basename$version] + lappend dirs [file join $grandParentDir share $basename$version] + lappend dirs [file join $parentDir share tcl8 $basename$version] + lappend dirs [file join $grandParentDir share tcl8 $basename$version] lappend dirs [file join $parentDir library] if {0} { lappend dirs [file join $grandParentDir library] diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl index 4cf73d0..6e7ed39 100644 --- a/library/dde/pkgIndex.tcl +++ b/library/dde/pkgIndex.tcl @@ -1,7 +1,3 @@ if {([info commands ::tcl::pkgconfig] eq "") || ([info sharedlibextension] ne ".dll")} return -if {[::tcl::pkgconfig get debug]} { - package ifneeded dde 1.4.0 [list load [file join $dir tcldde14g.dll] dde] -} else { - package ifneeded dde 1.4.0 [list load [file join $dir tcldde14.dll] dde] -} +package ifneeded dde 1.4.0 [list load [file join $dir tcldde1.dll] dde] diff --git a/library/init.tcl b/library/init.tcl index fac1722..112bea8 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -16,7 +16,7 @@ if {[info commands package] == ""} { error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]" } -package require -exact Tcl 8.7a0 +package require -exact Tcl 8.7.0-alpha.0 # Compute the auto path to use in this interpreter. # The values on the path come from several locations: @@ -54,7 +54,11 @@ namespace eval tcl { } } set Dir [file join [file dirname [file dirname \ - [info nameofexecutable]]] lib] + [info nameofexecutable]]] lib tcl8] + if {$Dir ni $::auto_path} { + lappend ::auto_path $Dir + } + set Dir [file dirname $Dir] if {$Dir ni $::auto_path} { lappend ::auto_path $Dir } diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl index b1fe234..4c00cb8 100755 --- a/library/reg/pkgIndex.tcl +++ b/library/reg/pkgIndex.tcl @@ -1,9 +1,4 @@ if {([info commands ::tcl::pkgconfig] eq "") || ([info sharedlibextension] ne ".dll")} return -if {[::tcl::pkgconfig get debug]} { - package ifneeded registry 1.3.2 \ - [list load [file join $dir tclreg13g.dll] registry] -} else { - package ifneeded registry 1.3.2 \ - [list load [file join $dir tclreg13.dll] registry] -} +package ifneeded registry 1.3.2 \ + [list load [file join $dir tclreg1.dll] registry] diff --git a/library/tm.tcl b/library/tm.tcl index 66c56a1..ab33134 100644 --- a/library/tm.tcl +++ b/library/tm.tcl @@ -317,7 +317,6 @@ proc ::tcl::tm::Defaults {} { # Note that we're using [::list], not [list] because [list] means # something other than [::list] in this namespace. roots [::list \ - [file dirname [info library]] \ [file join [file dirname [file dirname $exe]] lib] \ ] @@ -326,6 +325,11 @@ proc ::tcl::tm::Defaults {} { } else { set sep ":" } + if {[info exists env(TCL${major}_TM_PATH)]} { + foreach p [split $env(TCL${major}_TM_PATH) $sep] { + path add $p + } + } for {set n $minor} {$n >= 0} {incr n -1} { foreach ev [::list \ TCL${major}.${n}_TM_PATH \ |