Experiments with [http://semver.org/|Semantic Versioning] in Tcl. (Don't look!)

5 files changed, 22 insertions, 19 deletions

diff --git a/library/auto.tcl b/library/auto.tcl
index 02edcc4..3a93f0e 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..a8c9c8d 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 tcldde14.dll] dde]
diff --git a/library/init.tcl b/library/init.tcl
index 85900d2..0ebdb3a 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.6.4
+package require -exact Tcl 8.7a0
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
@@ -57,6 +57,11 @@ namespace eval tcl {
     if {$Dir ni $::auto_path} {
 	lappend ::auto_path $Dir
     }
+    set Dir [file join [file dirname [file dirname \
+	    [info nameofexecutable]]] lib tcl8]
+    if {$Dir ni $::auto_path} {
+	lappend ::auto_path $Dir
+    }
     catch {
 	foreach Dir $::tcl_pkgPath {
 	    if {$Dir ni $::auto_path} {
diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl
index 49fd1ac..38d6b8b 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.1 \
-            [list load [file join $dir tclreg13g.dll] registry]
-} else {
-    package ifneeded registry 1.3.1 \
-            [list load [file join $dir tclreg13.dll] registry]
-}
+package ifneeded registry 1.3.0 \
+	[list load [file join $dir tclreg13.dll] registry]
diff --git a/library/tm.tcl b/library/tm.tcl
index 66c56a1..9a9ce75 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -316,8 +316,8 @@ proc ::tcl::tm::Defaults {} {
 
     # Note that we're using [::list], not [list] because [list] means
     # something other than [::list] in this namespace.
+    path add [info library]
     roots [::list \
-	    [file dirname [info library]] \
 	    [file join [file dirname [file dirname $exe]] lib] \
 	    ]
 
@@ -326,6 +326,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 \