Check-in [eb06aeb256]
Overview
Comment:Updated teapotclient to understand "intel" means "x86"
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:eb06aeb256660b0cc0b86be12e38bd3d0320da08
User & Date: rkeene on 2009-04-19 09:42:43
Other Links: manifest | tags
Context
2009-04-19
09:54
Updated teapot-client to be installed check-in: f744667bec user: rkeene tags: trunk
09:42
Updated teapotclient to understand "intel" means "x86" check-in: eb06aeb256 user: rkeene tags: trunk
08:19
Added support for using "vfs::zip" if it is available. check-in: 738556ed56 user: rkeene tags: trunk
Changes

Modified client/lib/teapotclient0.1/teapotclient.tcl from [eeda69a9b1] to [a2644bf429].

    68     68   			exec unzip -d $dir -n -qq $urlcachefile
    69     69   		}
    70     70   	}
    71     71   
    72     72   	set pkgcachedir [file join [__get_homedir] ".teapot-client" "cachedir"]
    73     73   
    74     74           # Conversions from Teapot-style names to local ones
    75         -	set osTeapotToLocal(tcl) *
    76         -	set osTeapotToLocal(linux-*) linux
    77         -	set osTeapotToLocal(win32) windows
    78         -	set osTeapotToLocal(solaris*) solaris
    79         -	set osTeapotToLocal(freebsd) freebsd_*
    80         -	set osTeapotToLocal(irix) irix_*
           75  +	set osTeapotToLocal(tcl) [list *]
           76  +	set osTeapotToLocal(linux-*) [list linux]
           77  +	set osTeapotToLocal(win32) [list windows]
           78  +	set osTeapotToLocal(solaris*) [list solaris]
           79  +	set osTeapotToLocal(freebsd) [list freebsd_*]
           80  +	set osTeapotToLocal(irix) [list irix_*]
    81     81   
    82         -	set cpuTeapotToLocal(ix86) x86
    83         -	set cpuTeapotToLocal(sparc) sun4*
    84         -	set cpuTeapotToLocal(universal) *
    85         -	set cpuTeapotToLocal(powerpc) ppc
           82  +	set cpuTeapotToLocal(ix86) [list x86 intel]
           83  +	set cpuTeapotToLocal(sparc) [list sun4*]
           84  +	set cpuTeapotToLocal(universal) [list *]
           85  +	set cpuTeapotToLocal(powerpc) [list ppc]
    86     86   
    87     87   	proc download_extensions {rootdir servers extensions os cpu {existingExts ""}} {
    88     88   		foreach chkdefext [list Tcl Tk] {
    89     89   			if {[lsearch -exact $existingExts $chkdefext] == -1} {
    90     90   				lappend existingExts $chkdefext
    91     91   			}
    92     92   		}
................................................................................
   286    286   
   287    287   			set isCompatOS 0
   288    288   			if {$arch == "tcl"} {
   289    289   				set isCompatOS 1
   290    290   			} elseif {[string match $limitos $arch_os]} {
   291    291   				set isCompatOS 1
   292    292   			} else {
   293         -				foreach {teapot local} [array get osTeapotToLocal] {
   294         -					if {[string match $limitos $local] || [string match $local $limitos]} {
   295         -						if {[string match $teapot $arch_os] || [string match $arch_os $teapot]} {
   296         -							set isCompatOS 1
   297         -							break
          293  +				foreach {teapot localvariants} [array get osTeapotToLocal] {
          294  +					foreach local $localvariants {
          295  +						if {[string match $limitos $local] || [string match $local $limitos]} {
          296  +							if {[string match $teapot $arch_os] || [string match $arch_os $teapot]} {
          297  +								set isCompatOS 1
          298  +								break
          299  +							}
   298    300   						}
   299    301   					}
   300    302   				}
   301    303   			}
   302    304   			if {!$isCompatOS} {
   303    305   				continue
   304    306   			}
................................................................................
   305    307   
   306    308   			set isCompatCPU 0
   307    309   			if {$arch == "tcl"} {
   308    310   				set isCompatCPU 1
   309    311   			} elseif {[string match $limitcpu $arch_cpu]} {
   310    312   				set isCompatCPU 1
   311    313   			} else {
   312         -				foreach {teapot local} [array get cpuTeapotToLocal] {
   313         -					if {[string match $limitcpu $local] || [string match $local $limitcpu]} {
   314         -						if {[string match $teapot $arch_cpu] || [string match $arch_cpu $teapot]} {
   315         -							set isCompatCPU 1
   316         -							break
          314  +				foreach {teapot localvariants} [array get cpuTeapotToLocal] {
          315  +					foreach local $localvariants {
          316  +						if {[string match $limitcpu $local] || [string match $local $limitcpu]} {
          317  +							if {[string match $teapot $arch_cpu] || [string match $arch_cpu $teapot]} {
          318  +								set isCompatCPU 1
          319  +								break
          320  +							}
   317    321   						}
   318    322   					}
   319    323   				}
   320    324   			}
   321    325   			if {!$isCompatCPU} {
   322    326   				continue
   323    327   			}