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 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 |
set kitbuilt 1
if {[file tail [file dirname $file]] == "failed"} {
set failedtests [list "${shortfile}-XX-build.log"]
set kitbuilt 0
}
## Split the filename into parts and store each part
set kitbuildinfo [split $shortfile -]
set tclversion [lindex $kitbuildinfo 1]
set kitbuildinfo [lsort -dictionary [lrange $kitbuildinfo 2 end]]
## Determine Kit OS from random file names
unset -nocomplain kitos kitcpu
if {[lsearch -exact $kitbuildinfo "win32"] != -1} {
set idx [lsearch -exact $kitbuildinfo "win32"]
set kitbuildinfo [lreplace $kitbuildinfo $idx $idx]
set kitos "windows"
set kitcpu "i586"
} elseif {[lsearch -exact $kitbuildinfo "arm"] != -1} {
set idx [lsearch -exact $kitbuildinfo "arm"]
set kitbuildinfo [lreplace $kitbuildinfo $idx $idx]
set kitos "linux"
set kitcpu "arm"
} else {
set idx [lsearch -exact $kitbuildinfo "normal"]
if {$idx != -1} {
set kitbuildinfo [lreplace $kitbuildinfo $idx $idx]
}
set kitos [string tolower $tcl_platform(os)]
set kitcpu [string tolower $tcl_platform(machine)]
}
# Generate array to describe this kit
unset -nocomplain kitinfo
set kitinfo(version) $tclversion
set kitinfo(file) $shortfile
set kitinfo(fullfile) $file
set kitinfo(buildfile) $buildfile
|
> < < < < < < < < < < < < | | < < < < | < < < < > > |
139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 |
set kitbuilt 1
if {[file tail [file dirname $file]] == "failed"} {
set failedtests [list "${shortfile}-XX-build.log"]
set kitbuilt 0
}
## Split the filename into parts and store each part
unset -nocomplain kitos kitcpu
set kitbuildinfo [split $shortfile -]
set tclversion [lindex $kitbuildinfo 1]
set kitos [lindex $kitbuildinfo 2]
set kitcpu [lindex $kitbuildinfo 3]
### Store the remainder as a list of tags
set kitbuildinfo [lsort -dictionary [lrange $kitbuildinfo 4 end]]
# Generate array to describe this kit
unset -nocomplain kitinfo
set kitinfo(version) $tclversion
set kitinfo(file) $shortfile
set kitinfo(fullfile) $file
set kitinfo(buildfile) $buildfile
|
Modified build/test/test from [0cfadb5b00] to [bbdd56ab6f].
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
continue
fi
rm -f "${file}"
done
failed=""
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
kitcreator="./kitcreator"
args=""
runnable="1"
iszip="0"
statictk="0"
notk="0"
# Handle base configuration
case "${kit}" in
normal|normal-*)
true
;;
min)
kitcreator="./build/make-minkit"
iszip="1"
notk="1"
;;
min-static)
kitcreator="./build/make-minkit-static"
iszip="1"
notk="1"
;;
win32|win32-*)
kitcreator="./build/make-kit-win32"
runnable="0"
;;
arm-min)
kitcreator="./build/make-kit-arm"
runnable="0"
notk="1"
iszip="1"
;;
esac
|
| > > < > > > | |
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 |
continue
fi
rm -f "${file}"
done
failed=""
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
kitcreator="./kitcreator"
args=""
runnable="1"
iszip="0"
statictk="0"
notk="0"
# Handle base configuration
os="$(uname -s | dd conv=lcase 2>/dev/null)"
cpu="$(uname -m | dd conv=lcase 2>/dev/null)"
case "${kit}" in
normal|normal-*)
kit="$(echo "${kit}" | sed "s@^normal@$os-$cpu@")"
;;
min)
kitcreator="./build/make-minkit"
iszip="1"
notk="1"
kit="${os}-${cpu}-min"
;;
min-static)
kitcreator="./build/make-minkit-static"
iszip="1"
notk="1"
kit="${os}-${cpu}-min-static"
;;
win32|win32-*)
kitcreator="./build/make-kit-win32"
runnable="0"
;;
linux-arm-min)
kitcreator="./build/make-kit-arm"
runnable="0"
notk="1"
iszip="1"
;;
esac
|