Check-in [0f7ae7bf19]
Overview
Comment:Updated to include OS and CPU in Kit build info
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:0f7ae7bf1936c8b7d2827adf74375ca1880d2775
User & Date: rkeene on 2010-09-26 04:47:34
Other Links: manifest | tags
Context
2010-09-26
04:47
Fixed issue with zlib support in TclVFS when using Tcl 8.6+ native "zlib" command check-in: 468076b014 user: rkeene tags: trunk
04:47
Updated to include OS and CPU in Kit build info check-in: 0f7ae7bf19 user: rkeene tags: trunk
04:47
Updated to fix display problem with file sizes check-in: 498cc90308 user: rkeene tags: trunk
Changes

Modified build/test/publish-tests from [ccd0830569] to [da07d29b3c].

   139    139   	set kitbuilt 1
   140    140   	if {[file tail [file dirname $file]] == "failed"} {
   141    141   		set failedtests [list "${shortfile}-XX-build.log"]
   142    142   		set kitbuilt 0
   143    143   	}
   144    144   
   145    145   	## Split the filename into parts and store each part
          146  +	unset -nocomplain kitos kitcpu
   146    147   	set kitbuildinfo [split $shortfile -]
   147    148   	set tclversion [lindex $kitbuildinfo 1]
   148         -	set kitbuildinfo [lsort -dictionary [lrange $kitbuildinfo 2 end]]
          149  +	set kitos [lindex $kitbuildinfo 2]
          150  +	set kitcpu [lindex $kitbuildinfo 3]
   149    151   
   150         -	## Determine Kit OS from random file names
   151         -	unset -nocomplain kitos kitcpu
   152         -	if {[lsearch -exact $kitbuildinfo "win32"] != -1} {
   153         -		set idx [lsearch -exact $kitbuildinfo "win32"]
   154         -		set kitbuildinfo [lreplace $kitbuildinfo $idx $idx]
   155         -		set kitos "windows"
   156         -		set kitcpu "i586"
   157         -	} elseif {[lsearch -exact $kitbuildinfo "arm"] != -1} {
   158         -		set idx [lsearch -exact $kitbuildinfo "arm"]
   159         -		set kitbuildinfo [lreplace $kitbuildinfo $idx $idx]
   160         -		set kitos "linux"
   161         -		set kitcpu "arm"
   162         -	} else {
   163         -		set idx [lsearch -exact $kitbuildinfo "normal"]
   164         -		if {$idx != -1} {
   165         -			set kitbuildinfo [lreplace $kitbuildinfo $idx $idx]
   166         -		}
   167         -
   168         -		set kitos [string tolower $tcl_platform(os)]
   169         -		set kitcpu [string tolower $tcl_platform(machine)]
   170         -	}
          152  +	### Store the remainder as a list of tags
          153  +	set kitbuildinfo [lsort -dictionary [lrange $kitbuildinfo 4 end]]
   171    154   
   172    155   	# Generate array to describe this kit
   173    156   	unset -nocomplain kitinfo
   174    157   	set kitinfo(version) $tclversion
   175    158   	set kitinfo(file) $shortfile
   176    159   	set kitinfo(fullfile) $file
   177    160   	set kitinfo(buildfile) $buildfile

Modified build/test/test from [0cfadb5b00] to [bbdd56ab6f].

    41     41   		continue
    42     42   	fi
    43     43   
    44     44   	rm -f "${file}"
    45     45   done
    46     46   
    47     47   failed=""
    48         -for kit in normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk min min-static win32 win32-zip win32-threaded win32-threaded-zip win32-notk win32-threaded-notk arm-min; do
           48  +for kit in normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk min min-static win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk linux-arm-min; do
    49     49   	kitcreator="./kitcreator"
    50     50   	args=""
    51     51   	runnable="1"
    52     52   	iszip="0"
    53     53   	statictk="0"
    54     54   	notk="0"
    55     55   
    56     56   	# Handle base configuration
           57  +	os="$(uname -s | dd conv=lcase 2>/dev/null)"
           58  +	cpu="$(uname -m | dd conv=lcase 2>/dev/null)"
    57     59   	case "${kit}" in
    58     60   		normal|normal-*)
    59         -			true
           61  +			kit="$(echo "${kit}" | sed "s@^normal@$os-$cpu@")"
    60     62   			;;
    61     63   		min)
    62     64   			kitcreator="./build/make-minkit"
    63     65   			iszip="1"
    64     66   			notk="1"
           67  +			kit="${os}-${cpu}-min"
    65     68   			;;
    66     69   		min-static)
    67     70   			kitcreator="./build/make-minkit-static"
    68     71   			iszip="1"
    69     72   			notk="1"
           73  +			kit="${os}-${cpu}-min-static"
    70     74   			;;
    71     75   		win32|win32-*)
    72     76   			kitcreator="./build/make-kit-win32"
    73     77   			runnable="0"
    74     78   			;;
    75         -		arm-min)
           79  +		linux-arm-min)
    76     80   			kitcreator="./build/make-kit-arm"
    77     81   			runnable="0"
    78     82   			notk="1"
    79     83   			iszip="1"
    80     84   			;;
    81     85   	esac
    82     86