From d7c342a4ee3392e4a7f62257ef6906bc1c1a3d2f Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 9 Aug 2001 01:06:42 +0000 Subject: Added checks for package dependencies. Bumped patchlevels of changed packages: http 2.3.2, msgcat 1.2.2, opt 0.4.3, tcltest 2.0.1. [Patch 448931] --- ChangeLog | 13 +++++++++++++ library/dde/pkgIndex.tcl | 1 + library/http/http.tcl | 7 ++++--- library/http/pkgIndex.tcl | 3 ++- library/msgcat/msgcat.tcl | 5 +++-- library/msgcat/pkgIndex.tcl | 3 ++- library/opt/optparse.tcl | 5 +++-- library/opt/pkgIndex.tcl | 3 ++- library/reg/pkgIndex.tcl | 1 + library/tcltest/pkgIndex.tcl | 3 ++- library/tcltest/tcltest.tcl | 6 ++++-- 11 files changed, 37 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 768d9d6..243da87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2001-08-08 Don Porter + * library/dde/pkgIndex.tcl: + * library/http/http.tcl: + * library/http/pkgIndex.tcl: + * library/msgcat/msgcat.tcl: + * library/msgcat/pkgIndex.tcl: + * library/opt/optparse.tcl: + * library/opt/pkgIndex.tcl: + * library/reg/pkgIndex.tcl: + * library/tcltest/tcltest.tcl: + * library/tcltest/pkgIndex.tcl: Added checks for package dependencies. + Bumped patchlevels of changed packages: http 2.3.2, msgcat 1.2.2, + opt 0.4.3, tcltest 2.0.1. [Patch 448931] + * README: * generic/tcl.h: * tools/tcl.wse.in: diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl index 7b02b3e..1439711 100644 --- a/library/dde/pkgIndex.tcl +++ b/library/dde/pkgIndex.tcl @@ -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 tcldde84d.dll] dde] } else { diff --git a/library/http/http.tcl b/library/http/http.tcl index 5e39030..10e094f 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -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.35 2001/08/02 04:21:16 dgp Exp $ +# RCS: @(#) $Id: http.tcl,v 1.36 2001/08/09 01:06:42 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.1 +package require Tcl 8.2 +package provide http 2.3.2 namespace eval http { variable http @@ -28,7 +29,7 @@ namespace eval http { -accept */* -proxyhost {} -proxyport {} - -useragent {Tcl http client package 2.3.1} + -useragent {Tcl http client package 2.3.2} -proxyfilter http::ProxyRequired } diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl index 6122042..4186a43 100644 --- a/library/http/pkgIndex.tcl +++ b/library/http/pkgIndex.tcl @@ -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.1 [list tclPkgSetup $dir http 2.3.1 {{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}}}] diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl index 27c4c57..4622ea1 100644 --- a/library/msgcat/msgcat.tcl +++ b/library/msgcat/msgcat.tcl @@ -10,9 +10,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: msgcat.tcl,v 1.10 2000/12/11 04:17:38 dgp Exp $ +# RCS: @(#) $Id: msgcat.tcl,v 1.11 2001/08/09 01:06:42 dgp Exp $ -package provide msgcat 1.2.1 +package require Tcl 8.2 +package provide msgcat 1.2.2 namespace eval msgcat { namespace export mc mcset mcmset mclocale mcpreferences mcunknown mcmax diff --git a/library/msgcat/pkgIndex.tcl b/library/msgcat/pkgIndex.tcl index acdd20c..d3f1d4b 100644 --- a/library/msgcat/pkgIndex.tcl +++ b/library/msgcat/pkgIndex.tcl @@ -1 +1,2 @@ -package ifneeded msgcat 1.2.1 [list source [file join $dir msgcat.tcl]] +if {![package vsatisfies [package provide Tcl] 8.2]} {return} +package ifneeded msgcat 1.2.2 [list source [file join $dir msgcat.tcl]] diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl index f3c82a1..e710008 100644 --- a/library/opt/optparse.tcl +++ b/library/opt/optparse.tcl @@ -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.5 2000/12/11 04:17:39 dgp Exp $ +# RCS: @(#) $Id: optparse.tcl,v 1.6 2001/08/09 01:06:42 dgp Exp $ -package provide opt 0.4.2 +package require Tcl 8 +package provide opt 0.4.3 namespace eval ::tcl { diff --git a/library/opt/pkgIndex.tcl b/library/opt/pkgIndex.tcl index 2de9531..02c289c 100644 --- a/library/opt/pkgIndex.tcl +++ b/library/opt/pkgIndex.tcl @@ -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]] diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl index b32c71b..a420419 100755 --- a/library/reg/pkgIndex.tcl +++ b/library/reg/pkgIndex.tcl @@ -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 tclreg84d.dll] registry] diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl index da93644..43e4656 100644 --- a/library/tcltest/pkgIndex.tcl +++ b/library/tcltest/pkgIndex.tcl @@ -8,4 +8,5 @@ # script is sourced, the variable $dir must contain the # full path name of this file's directory. -package ifneeded tcltest 2.0 [list source [file join $dir tcltest.tcl]] +if {![package vsatisfies [package provide Tcl] 8.3]} {return} +package ifneeded tcltest 2.0.1 [list source [file join $dir tcltest.tcl]] diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index cb3d405..cdeef93 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -13,10 +13,12 @@ # Copyright (c) 2000 by Ajuba Solutions # All rights reserved. # -# RCS: @(#) $Id: tcltest.tcl,v 1.30 2000/11/24 14:17:11 dkf Exp $ +# RCS: @(#) $Id: tcltest.tcl,v 1.31 2001/08/09 01:06:42 dgp Exp $ # create the "tcltest" namespace for all testing variables and procedures +package require Tcl 8.3 + namespace eval tcltest { # Export the public tcltest procs @@ -3481,5 +3483,5 @@ namespace eval tcltest { } } -package provide tcltest 2.0 +package provide tcltest 2.0.1 -- cgit v0.12