Index: library/lib/make.tcl =================================================================== diff -u -N -rf858f142f5fab4f88996b3eb709c3afa55114be9 -r073177c8b1304443107efeeb0c334e9477346778 --- library/lib/make.tcl (.../make.tcl) (revision f858f142f5fab4f88996b3eb709c3afa55114be9) +++ library/lib/make.tcl (.../make.tcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -18,7 +18,7 @@ set fls {} foreach f [glob -nocomplain *tcl] { if {![file isdirectory $f]} { - set F [open $f]; set c [read $F]; close $F + set F [file open $f]; set c [read $F]; close $F if {[string match "*package provide*" $c]} { lappend fls $f } } } @@ -75,6 +75,7 @@ close $IN; close $OUT } } + #puts stderr "+++ mkIndex name=$name, pwd=[pwd] DONE" } @@ -198,4 +199,4 @@ #puts stderr "+++ make.tcl finished." -#exit $::result \ No newline at end of file +#exit $::result Index: library/pkgIndex.tcl =================================================================== diff -u -N --- library/pkgIndex.tcl (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ library/pkgIndex.tcl (revision 0) @@ -1,10 +0,0 @@ -set __dir__ $dir -foreach index [concat \ - [glob -nocomplain [file join $dir * pkgIndex.tcl]] \ - [glob -nocomplain [file join $dir * * pkgIndex.tcl]]] { - set dir [file dirname $index] - source $index -} -set dir $__dir__ -unset __dir__ - Index: library/serialize/pkgIndex.tcl =================================================================== diff -u -N -r61ee196901f6c7444523b78c91a98f9f501c8f8b -r073177c8b1304443107efeeb0c334e9477346778 --- library/serialize/pkgIndex.tcl (.../pkgIndex.tcl) (revision 61ee196901f6c7444523b78c91a98f9f501c8f8b) +++ library/serialize/pkgIndex.tcl (.../pkgIndex.tcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -8,4 +8,4 @@ # script is sourced, the variable $dir must contain the # full path name of this file's directory. -package ifneeded nx::serializer 1.0 [list source [file join $dir serializer.tcl]] +package ifneeded nx::serializer 2.0 [list source [file join $dir serializer.tcl]] Index: library/serialize/serializer.tcl =================================================================== diff -u -N -r499667753aacfb7f77e708f14bf3d0b000a3e9fe -r073177c8b1304443107efeeb0c334e9477346778 --- library/serialize/serializer.tcl (.../serializer.tcl) (revision 499667753aacfb7f77e708f14bf3d0b000a3e9fe) +++ library/serialize/serializer.tcl (.../serializer.tcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -3,7 +3,7 @@ #package require nx::plain-object-method package require XOTcl 2.0 -package provide nx::serializer 1.0 +package provide nx::serializer 2.0 # For the time being, we require classical XOTcl. Index: library/xotcl/doc/langRef.xotcl =================================================================== diff -u -N -rfa7635cbfe2309b8e6282e2c7925fa2617b061aa -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/doc/langRef.xotcl (.../langRef.xotcl) (revision fa7635cbfe2309b8e6282e2c7925fa2617b061aa) +++ library/xotcl/doc/langRef.xotcl (.../langRef.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- tcl -*- -package provide XOTcl-langRef 1.6.4 -package require XOTcl +package provide XOTcl-langRef 2.0 +package require XOTcl 2.0 namespace eval ::xotcl {} namespace import -force ::xotcl::@ Index: library/xotcl/library/comm/Access.xotcl =================================================================== diff -u -N -r55d0e812c6b2d7895720b83d20addf87d0945c18 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/Access.xotcl (.../Access.xotcl) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) +++ library/xotcl/library/comm/Access.xotcl (.../Access.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,11 +1,11 @@ # -*- tcl -*- $ -set httpAccessVersion 1.2 +set httpAccessVersion 2.0 package provide xotcl::comm::httpAccess $httpAccessVersion package require xotcl::comm::pcache package require xotcl::comm::mime -package require xotcl::comm::connection 1.2 +package require xotcl::comm::connection package require xotcl::trace package require XOTcl 2.0 Index: library/xotcl/library/comm/Connection.xotcl =================================================================== diff -u -N -r6b1812b12163858c7317aa1dd607598632452eca -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/Connection.xotcl (.../Connection.xotcl) (revision 6b1812b12163858c7317aa1dd607598632452eca) +++ library/xotcl/library/comm/Connection.xotcl (.../Connection.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- tcl -*- $ -package provide xotcl::comm::connection 1.2 +package provide xotcl::comm::connection 2.0 package require XOTcl 2.0 Index: library/xotcl/library/comm/Dav.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/Dav.xotcl (.../Dav.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/comm/Dav.xotcl (.../Dav.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- Tcl -*- $ -package provide xotcl::comm::dav 0.91 +package provide xotcl::comm::dav 2.0 package require XOTcl 2.0 Index: library/xotcl/library/comm/Ftp.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/Ftp.xotcl (.../Ftp.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/comm/Ftp.xotcl (.../Ftp.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- Tcl -*- $ -package provide xotcl::comm::ftp 0.91 +package provide xotcl::comm::ftp 2.0 package require xotcl::comm::httpAccess package require XOTcl 2.0 Index: library/xotcl/library/comm/Httpd.xotcl =================================================================== diff -u -N -r55d0e812c6b2d7895720b83d20addf87d0945c18 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/Httpd.xotcl (.../Httpd.xotcl) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) +++ library/xotcl/library/comm/Httpd.xotcl (.../Httpd.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -5,14 +5,14 @@ # # Gustaf Neumann (neumann@wu-wien.ac.at) -set VERSION 1.2 +set VERSION 2.0 package provide xotcl::comm::httpd $VERSION package require XOTcl 2.0 #package require xotcl::comm::httpAccess -package require xotcl::comm::connection 1.2 +package require xotcl::comm::connection package require xotcl::trace package require xotcl::comm::mime Index: library/xotcl/library/comm/Imap.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/Imap.xotcl (.../Imap.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/comm/Imap.xotcl (.../Imap.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- Tcl -*- $ -package provide xotcl::comm::imap 0.91 +package provide xotcl::comm::imap 2.0 package require XOTcl 2.0 Index: library/xotcl/library/comm/Ldap.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/Ldap.xotcl (.../Ldap.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/comm/Ldap.xotcl (.../Ldap.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,5 +1,5 @@ # -*- Tcl -*- -package provide xotcl::comm::ldap 0.91 +package provide xotcl::comm::ldap 2.0 package require xotcl::wafecompat ; # Get 'requireModules'. Index: library/xotcl/library/comm/Mime.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/Mime.xotcl (.../Mime.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/comm/Mime.xotcl (.../Mime.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- Tcl -*- -package provide xotcl::comm::mime 0.91 +package provide xotcl::comm::mime 2.0 package require XOTcl 2.0 Index: library/xotcl/library/comm/PCache.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/PCache.xotcl (.../PCache.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/comm/PCache.xotcl (.../PCache.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -16,7 +16,7 @@ # file (before the first open) through the instance variable "dir" # in the object persistentCache. -package provide xotcl::comm::pcache 0.91 +package provide xotcl::comm::pcache 2.0 #package require xotcl::package package require XOTcl 2.0 Index: library/xotcl/library/comm/pkgIndex.tcl =================================================================== diff -u -N -r55d0e812c6b2d7895720b83d20addf87d0945c18 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/comm/pkgIndex.tcl (.../pkgIndex.tcl) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) +++ library/xotcl/library/comm/pkgIndex.tcl (.../pkgIndex.tcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -8,12 +8,12 @@ # script is sourced, the variable $dir must contain the # full path name of this file's directory. -package ifneeded xotcl::comm::connection 1.2 [list source [file join $dir Connection.xotcl]] -package ifneeded xotcl::comm::dav 0.91 [list source [file join $dir Dav.xotcl]] -package ifneeded xotcl::comm::ftp 0.91 [list source [file join $dir Ftp.xotcl]] -package ifneeded xotcl::comm::httpAccess 1.2 [list source [file join $dir Access.xotcl]] -package ifneeded xotcl::comm::httpd 1.2 [list source [file join $dir Httpd.xotcl]] -package ifneeded xotcl::comm::imap 0.91 [list source [file join $dir Imap.xotcl]] -package ifneeded xotcl::comm::ldap 0.91 [list source [file join $dir Ldap.xotcl]] -package ifneeded xotcl::comm::mime 0.91 [list source [file join $dir Mime.xotcl]] -package ifneeded xotcl::comm::pcache 0.91 [list source [file join $dir PCache.xotcl]] +package ifneeded xotcl::comm::connection 2.0 [list source [file join $dir Connection.xotcl]] +package ifneeded xotcl::comm::dav 2.0 [list source [file join $dir Dav.xotcl]] +package ifneeded xotcl::comm::ftp 2.0 [list source [file join $dir Ftp.xotcl]] +package ifneeded xotcl::comm::httpAccess 2.0 [list source [file join $dir Access.xotcl]] +package ifneeded xotcl::comm::httpd 2.0 [list source [file join $dir Httpd.xotcl]] +package ifneeded xotcl::comm::imap 2.0 [list source [file join $dir Imap.xotcl]] +package ifneeded xotcl::comm::ldap 2.0 [list source [file join $dir Ldap.xotcl]] +package ifneeded xotcl::comm::mime 2.0 [list source [file join $dir Mime.xotcl]] +package ifneeded xotcl::comm::pcache 2.0 [list source [file join $dir PCache.xotcl]] Index: library/xotcl/library/lib/Script.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/Script.xotcl (.../Script.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/lib/Script.xotcl (.../Script.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,5 +1,5 @@ # -*- Tcl -*- -package provide xotcl::script 0.91 +package provide xotcl::script 2.0 package require XOTcl 2.0 namespace eval ::xotcl::script { Index: library/xotcl/library/lib/htmllib.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/htmllib.xotcl (.../htmllib.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/lib/htmllib.xotcl (.../htmllib.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -35,7 +35,7 @@ # MODIFICATIONS. # -package provide xotcl::htmllib 0.1 +package provide xotcl::htmllib 2.0 package require XOTcl 2.0 namespace eval ::xotcl::htmllib { Index: library/xotcl/library/lib/metadataAnalyzer.xotcl =================================================================== diff -u -N -r5d1617640ad71fd52b069f81cfcadbe4cbb6f2a2 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/metadataAnalyzer.xotcl (.../metadataAnalyzer.xotcl) (revision 5d1617640ad71fd52b069f81cfcadbe4cbb6f2a2) +++ library/xotcl/library/lib/metadataAnalyzer.xotcl (.../metadataAnalyzer.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,5 +1,5 @@ # -*- Tcl -*- -package provide xotcl::metadataAnalyzer 0.86 +package provide xotcl::metadataAnalyzer 2.0 package require XOTcl 2.0 namespace eval ::xotcl::metadataAnalyzer { Index: library/xotcl/library/lib/mixinStrategy.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/mixinStrategy.xotcl (.../mixinStrategy.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/lib/mixinStrategy.xotcl (.../mixinStrategy.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,5 +1,5 @@ # -*- Tcl -*- -package provide xotcl::mixinStrategy 0.91 +package provide xotcl::mixinStrategy 2.0 package require XOTcl 2.0 Index: library/xotcl/library/lib/package.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/package.xotcl (.../package.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/lib/package.xotcl (.../package.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,5 +1,5 @@ # -*- Tcl -*- -package provide xotcl::package 0.92 +package provide xotcl::package 2.0 package require XOTcl 2.0 package require xotcl::mixinStrategy Index: library/xotcl/library/lib/pkgIndex-package.add =================================================================== diff -u -N -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/pkgIndex-package.add (.../pkgIndex-package.add) (revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c) +++ library/xotcl/library/lib/pkgIndex-package.add (.../pkgIndex-package.add) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1 +1 @@ -package ifneeded xotcl::package 0.91 [list source [file join $dir package.xotcl]] +package ifneeded xotcl::package 2.0 [list source [file join $dir package.xotcl]] Index: library/xotcl/library/lib/staticMetadata.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/staticMetadata.xotcl (.../staticMetadata.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/lib/staticMetadata.xotcl (.../staticMetadata.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,7 +1,7 @@ # -*- Tcl -*- package require XOTcl 2.0 package require xotcl::metadataAnalyzer -package provide xotcl::staticMetadataAnalyzer 0.85 +package provide xotcl::staticMetadataAnalyzer 2.0 namespace eval ::xotcl::staticMetadataAnalyzer { namespace import ::xotcl::* Index: library/xotcl/library/lib/trace.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/trace.xotcl (.../trace.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/lib/trace.xotcl (.../trace.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,5 +1,5 @@ # -*- Tcl -*- $ -package provide xotcl::trace 0.92 +package provide xotcl::trace 2.0 package require XOTcl 2.0 namespace eval ::xotcl::trace { Index: library/xotcl/library/lib/upvarcompat.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/upvarcompat.xotcl (.../upvarcompat.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/lib/upvarcompat.xotcl (.../upvarcompat.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- Tcl -*- -package provide xotcl::upvar-compat 1.1 +package provide xotcl::upvar-compat 2.0 package require XOTcl 2.0 namespace eval ::xotcl::upvar-compat { Index: library/xotcl/library/lib/wafecompat.tcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/wafecompat.tcl (.../wafecompat.tcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/lib/wafecompat.tcl (.../wafecompat.tcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,5 +1,5 @@ # -*- Tcl -*- -package provide xotcl::wafecompat 0.91 +package provide xotcl::wafecompat 2.0 set WAFELIB /usr/lib/X11/wafe/ set MODULE_PATH "$WAFELIB $auto_path" Index: library/xotcl/library/lib/xodoc.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/lib/xodoc.xotcl (.../xodoc.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/lib/xodoc.xotcl (.../xodoc.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- Tcl -*- package require XOTcl 2.0 -package provide xotcl::xodoc 0.85 +package provide xotcl::xodoc 2.0 package require xotcl::staticMetadataAnalyzer package require xotcl::htmllib Index: library/xotcl/library/serialize/RecoveryPoint.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/serialize/RecoveryPoint.xotcl (.../RecoveryPoint.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/serialize/RecoveryPoint.xotcl (.../RecoveryPoint.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- Tcl -*- -package provide xotcl::scriptCreation::recoveryPoint 0.81 +package provide xotcl::scriptCreation::recoveryPoint 2.0 package require XOTcl 2.0 namespace eval ::xotcl::scriptCreation::recoveryPoint { Index: library/xotcl/library/serialize/ScriptCreator.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/library/serialize/ScriptCreator.xotcl (.../ScriptCreator.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/serialize/ScriptCreator.xotcl (.../ScriptCreator.xotcl) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -1,6 +1,6 @@ # -*- Tcl -*- -package provide xotcl::scriptCreation::scriptCreator 0.81 +package provide xotcl::scriptCreation::scriptCreator 2.0 package require XOTcl 2.0 namespace eval ::xotcl::scriptCreation::scriptCreator { Index: library/xotcl/tests/xocomm.test =================================================================== diff -u -N -rd9214c77fc394b8a36f334d02432547a3904dea8 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/tests/xocomm.test (.../xocomm.test) (revision d9214c77fc394b8a36f334d02432547a3904dea8) +++ library/xotcl/tests/xocomm.test (.../xocomm.test) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -29,7 +29,7 @@ puts $startCmd } -package require xotcl::comm::httpAccess 1.2 +package require xotcl::comm::httpAccess package require xotcl::comm::ftp package require xotcl::trace