Check-in [33f3f786ae]
Overview
Comment:Updated Teapotclient matching to be case insensitive Updated Makefile to try system-wide teapot-client if available
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:33f3f786ae2929bb88dabe41aa07c00e5e10cdee
User & Date: rkeene on 2009-09-06 20:39:41
Other Links: manifest | tags
Context
2009-09-18
11:31
Added support for specifying packages not to install check-in: 0abbc5472a user: rkeene tags: trunk
2009-09-06
20:39
Updated Teapotclient matching to be case insensitive Updated Makefile to try system-wide teapot-client if available check-in: 33f3f786ae user: rkeene tags: trunk
20:24
Updated teapotclient to support Solaris/x86 check-in: 822485ddf1 user: rkeene tags: trunk
Changes

Modified client/Makefile from [7dab59f4d8] to [fec1dfff01].

31
32
33
34
35
36
37
38

39
40
41
42
43
44
45
46
47
48
49
teapot-client.kit: teapot-client.tcl lib/teapotclient0.1/pkgIndex.tcl lib/teapotclient0.1/teapotclient.tcl
	rm -rf teapot-client-tmp.vfs
	mkdir teapot-client-tmp.vfs
	cp -r lib teapot-client.tcl teapot-client-tmp.vfs/
	echo 'package require starkit' > teapot-client-tmp.vfs/main.tcl
	echo 'starkit::startup' >> teapot-client-tmp.vfs/main.tcl
	echo 'source $$starkit::topdir/teapot-client.tcl' >> teapot-client-tmp.vfs/main.tcl
	./teapot-client.tcl get teapot-client-tmp.vfs/ tcl tcl md5 fileutil vfs::zip

	$(TCLKIT) support/sdx.kit wrap teapot-client-tmp.kit
	rm -rf teapot-client-tmp.vfs
	mv teapot-client-tmp.kit teapot-client.kit

clean:
	rm -f teapot-client.kit
	rm -rf teapot-client-tmp.vfs

distclean: clean

.PHONY: all install clean distclean







|
>











31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
teapot-client.kit: teapot-client.tcl lib/teapotclient0.1/pkgIndex.tcl lib/teapotclient0.1/teapotclient.tcl
	rm -rf teapot-client-tmp.vfs
	mkdir teapot-client-tmp.vfs
	cp -r lib teapot-client.tcl teapot-client-tmp.vfs/
	echo 'package require starkit' > teapot-client-tmp.vfs/main.tcl
	echo 'starkit::startup' >> teapot-client-tmp.vfs/main.tcl
	echo 'source $$starkit::topdir/teapot-client.tcl' >> teapot-client-tmp.vfs/main.tcl
	./teapot-client.tcl get teapot-client-tmp.vfs/ tcl tcl md5 fileutil vfs::zip || \
		teapot-client get teapot-client-tmp.vfs/ tcl tcl md5 fileutil vfs::zip
	$(TCLKIT) support/sdx.kit wrap teapot-client-tmp.kit
	rm -rf teapot-client-tmp.vfs
	mv teapot-client-tmp.kit teapot-client.kit

clean:
	rm -f teapot-client.kit
	rm -rf teapot-client-tmp.vfs

distclean: clean

.PHONY: all install clean distclean

Modified client/lib/teapotclient0.1/teapotclient.tcl from [222fc70826] to [ff47dbe894].

288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
...
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
			if {$arch == "tcl"} {
				set isCompatOS 1
			} elseif {[string match $limitos $arch_os]} {
				set isCompatOS 1
			} else {
				foreach {teapot localvariants} [array get osTeapotToLocal] {
					foreach local $localvariants {
						if {[string match $limitos $local] || [string match $local $limitos]} {
							if {[string match $teapot $arch_os] || [string match $arch_os $teapot]} {
								set isCompatOS 1
								break
							}
						}
					}
				}
			}
................................................................................
			if {!$isCompatOS} {
				continue
			}

			set isCompatCPU 0
			if {$arch == "tcl"} {
				set isCompatCPU 1
			} elseif {[string match $limitcpu $arch_cpu]} {
				set isCompatCPU 1
			} else {
				foreach {teapot localvariants} [array get cpuTeapotToLocal] {
					foreach local $localvariants {
						if {[string match $limitcpu $local] || [string match $local $limitcpu]} {
							if {[string match $teapot $arch_cpu] || [string match $arch_cpu $teapot]} {
								set isCompatCPU 1
								break
							}
						}
					}
				}
			}







|
|







 







|




|
|







288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
...
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
			if {$arch == "tcl"} {
				set isCompatOS 1
			} elseif {[string match $limitos $arch_os]} {
				set isCompatOS 1
			} else {
				foreach {teapot localvariants} [array get osTeapotToLocal] {
					foreach local $localvariants {
						if {[string match -nocase $limitos $local] || [string match -nocase $local $limitos]} {
							if {[string match -nocase $teapot $arch_os] || [string match -nocase $arch_os $teapot]} {
								set isCompatOS 1
								break
							}
						}
					}
				}
			}
................................................................................
			if {!$isCompatOS} {
				continue
			}

			set isCompatCPU 0
			if {$arch == "tcl"} {
				set isCompatCPU 1
			} elseif {[string match -nocase $limitcpu $arch_cpu]} {
				set isCompatCPU 1
			} else {
				foreach {teapot localvariants} [array get cpuTeapotToLocal] {
					foreach local $localvariants {
						if {[string match -nocase $limitcpu $local] || [string match -nocase $local $limitcpu]} {
							if {[string match -nocase $teapot $arch_cpu] || [string match -nocase $arch_cpu $teapot]} {
								set isCompatCPU 1
								break
							}
						}
					}
				}
			}