Tcl Source Code

Artifact [8968b74d51]
Login

Artifact 8968b74d510b0ef5d327d0a2e265176433955f48:

Attachment "depend83.patch" to ticket [448931ffff] added by dgp 2001-08-08 11:37:02.
Index: library/dde1.1/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/dde1.1/Attic/pkgIndex.tcl,v
retrieving revision 1.4
diff -u -r1.4 pkgIndex.tcl
--- library/dde1.1/pkgIndex.tcl	2000/04/20 01:30:19	1.4
+++ library/dde1.1/pkgIndex.tcl	2001/08/08 04:22:28
@@ -1,3 +1,4 @@
+if {![package vsatisfies [package provide Tcl] 8]} {return}
 if {[info exists tcl_platform(debug)]} {
     package ifneeded dde 1.1 [list load [file join $dir tcldde83d.dll] dde]
 } else {
Index: library/http/http.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/http/http.tcl,v
retrieving revision 1.32.2.1
diff -u -r1.32.2.1 http.tcl
--- library/http/http.tcl	2000/05/31 01:28:57	1.32.2.1
+++ library/http/http.tcl	2001/08/08 04:22:28
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: http.tcl,v 1.32.2.1 2000/05/31 01:28:57 sandeep Exp $
+# RCS: @(#) $Id: http.tcl,v 1.35 2001/08/02 04:21:16 dgp Exp $
 
 # Rough version history:
 # 1.0	Old http_get interface
@@ -20,7 +20,8 @@
 #	This version also cleans up error cases and eliminates the
 #	"ioerror" status in favor of raising an error
 
-package provide http 2.3
+package require Tcl 8.2
+package provide http 2.3.2
 
 namespace eval http {
     variable http
@@ -28,7 +29,7 @@
 	-accept */*
 	-proxyhost {}
 	-proxyport {}
-	-useragent {Tcl http client package 2.3}
+	-useragent {Tcl http client package 2.3.2}
 	-proxyfilter http::ProxyRequired
     }
 
@@ -853,10 +854,8 @@
 
     set alphanumeric	a-zA-Z0-9
     regsub -all \[^$alphanumeric\] $string {$formMap(&)} string
-    regsub -all \n $string {\\n} string
-    regsub -all \t $string {\\t} string
     regsub -all {[][{})\\]\)} $string {\\&} string
-    return [subst $string]
+    return [subst -nocommand $string]
 }
 
 # http::ProxyRequired --
Index: library/http/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/http/pkgIndex.tcl,v
retrieving revision 1.4
diff -u -r1.4 pkgIndex.tcl
--- library/http/pkgIndex.tcl	2000/03/18 02:16:40	1.4
+++ library/http/pkgIndex.tcl	2001/08/08 04:22:28
@@ -8,4 +8,5 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
-package ifneeded http 2.3 [list tclPkgSetup $dir http 2.3 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister}}}]
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded http 2.3.2 [list tclPkgSetup $dir http 2.3.2 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister}}}]
Index: library/msgcat/msgcat.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/msgcat/msgcat.tcl,v
retrieving revision 1.4.2.3
diff -u -r1.4.2.3 msgcat.tcl
--- library/msgcat/msgcat.tcl	2000/08/08 17:53:42	1.4.2.3
+++ library/msgcat/msgcat.tcl	2001/08/08 04:22:28
@@ -12,7 +12,8 @@
 # 
 # RCS: @(#) $Id: msgcat.tcl,v 1.4.2.3 2000/08/08 17:53:42 hobbs Exp $
 
-package provide msgcat 1.1
+package require Tcl 8.2
+package provide msgcat 1.1.1
 
 namespace eval msgcat {
     namespace export mc mcset mclocale mcpreferences mcunknown
@@ -49,7 +50,7 @@
     # Check for the src in each namespace starting from the local and
     # ending in the global.
 
-    set ns [uplevel {namespace current}]
+    set ns [uplevel 1 [list ::namespace current]]
     
     while {$ns != ""} {
 	foreach loc $::msgcat::loclist {
@@ -66,7 +67,7 @@
 	set ns [namespace parent $ns]
     }
     # we have not found the translation
-    return [uplevel 1 [list [namespace origin mcunknown] \
+    return [uplevel 1 [list [::namespace origin mcunknown] \
 	    $::msgcat::locale $src] $args]
 }
 
@@ -134,7 +135,10 @@
 	set langfile [file join $langdir $p.msg]
 	if {[file exists $langfile]} {
 	    incr x
-	    uplevel [list source $langfile]
+            set fid [open $langfile "r"]
+            fconfigure $fid -encoding utf-8
+            uplevel 1 [read $fid]
+            close $fid
 	}
     }
     return $x
@@ -158,7 +162,7 @@
 	set dest $src
     }
 
-    set ns [uplevel {namespace current}]
+    set ns [uplevel 1 [list ::namespace current]]
 
     set ::msgcat::msgs([string tolower $locale],$ns,$src) $dest
     return $dest
Index: library/msgcat/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/msgcat/pkgIndex.tcl,v
retrieving revision 1.2.12.1
diff -u -r1.2.12.1 pkgIndex.tcl
--- library/msgcat/pkgIndex.tcl	2000/08/08 18:08:11	1.2.12.1
+++ library/msgcat/pkgIndex.tcl	2001/08/08 04:22:28
@@ -1 +1,2 @@
-package ifneeded msgcat 1.1 [list source [file join $dir msgcat.tcl]]
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded msgcat 1.1.1 [list source [file join $dir msgcat.tcl]]
Index: library/opt/optparse.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/opt/optparse.tcl,v
retrieving revision 1.2.12.2
diff -u -r1.2.12.2 optparse.tcl
--- library/opt/optparse.tcl	2001/04/03 22:54:38	1.2.12.2
+++ library/opt/optparse.tcl	2001/08/08 04:22:28
@@ -8,9 +8,10 @@
 #	on it.  If your code does rely on this package you
 #	may directly incorporate this code into your application.
 #
-# RCS: @(#) $Id: optparse.tcl,v 1.2.12.2 2001/04/03 22:54:38 hobbs Exp $
+# RCS: @(#) $Id: optparse.tcl,v 1.5 2000/12/11 04:17:39 dgp Exp $
 
-package provide opt 0.4.2
+package require Tcl 8
+package provide opt 0.4.3
 
 namespace eval ::tcl {
 
Index: library/opt/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/opt/pkgIndex.tcl,v
retrieving revision 1.2.12.1
diff -u -r1.2.12.1 pkgIndex.tcl
--- library/opt/pkgIndex.tcl	2001/04/03 22:54:38	1.2.12.1
+++ library/opt/pkgIndex.tcl	2001/08/08 04:22:28
@@ -8,4 +8,5 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
-package ifneeded opt 0.4.2 [list source [file join $dir optparse.tcl]]
+if {![package vsatisfies [package provide Tcl] 8]} {return}
+package ifneeded opt 0.4.3 [list source [file join $dir optparse.tcl]]
Index: library/reg1.0/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/reg1.0/Attic/pkgIndex.tcl,v
retrieving revision 1.7
diff -u -r1.7 pkgIndex.tcl
--- library/reg1.0/pkgIndex.tcl	2000/04/20 01:30:20	1.7
+++ library/reg1.0/pkgIndex.tcl	2001/08/08 04:22:28
@@ -1,3 +1,4 @@
+if {![package vsatisfies [package provide Tcl] 8]} {return}
 if {[info exists tcl_platform(debug)]} {
     package ifneeded registry 1.0 \
             [list load [file join $dir tclreg83d.dll] registry]
Index: library/tcltest1.0/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/tcltest1.0/Attic/pkgIndex.tcl,v
retrieving revision 1.5
diff -u -r1.5 pkgIndex.tcl
--- library/tcltest1.0/pkgIndex.tcl	2000/01/27 23:44:07	1.5
+++ library/tcltest1.0/pkgIndex.tcl	2001/08/08 04:22:28
@@ -8,7 +8,8 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
-package ifneeded tcltest 1.0 [list tclPkgSetup $dir tcltest 1.0 \
+if {![package vsatisfies [package provide Tcl] 8.2]} {return}
+package ifneeded tcltest 1.0.1 [list tclPkgSetup $dir tcltest 1.0.1 \
 	{{tcltest.tcl source {::tcltest::bytestring ::tcltest::cleanupTests \
         ::tcltest::makeDirectory ::tcltest::makeFile ::tcltest::normalizeMsg \
         ::tcltest::removeDirectory ::tcltest::removeFile \
Index: library/tcltest1.0/tcltest.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/tcltest1.0/Attic/tcltest.tcl,v
retrieving revision 1.24
diff -u -r1.24 tcltest.tcl
--- library/tcltest1.0/tcltest.tcl	2000/04/11 01:04:19	1.24
+++ library/tcltest1.0/tcltest.tcl	2001/08/08 04:22:29
@@ -14,7 +14,8 @@
 # 
 # RCS: @(#) $Id: tcltest.tcl,v 1.24 2000/04/11 01:04:19 welch Exp $
 
-package provide tcltest 1.0
+package require Tcl 8.2
+package provide tcltest 1.0.1
 
 # create the "tcltest" namespace for all testing variables and procedures