Overview
| Comment: | Added support for creating debug symbols builds |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
57ce9464cc3f310ca1aeade4bee27c51 |
| User & Date: | rkeene on 2011-09-15 20:00:16 |
| Other Links: | manifest | tags |
Context
|
2011-09-16
| ||
| 00:36 | Fixed issue test not creating KitDLLs that are debugging check-in: 806626aa83 user: rkeene tags: trunk | |
|
2011-09-15
| ||
| 20:00 | Added support for creating debug symbols builds check-in: 57ce9464cc user: rkeene tags: trunk | |
|
2011-09-14
| ||
| 18:25 | Updated to pass "wget" errors from Tcl build up to stderr check-in: fd32e55ed8 user: rkeene tags: trunk | |
Changes
Modified build/make-kit-crosscompile from [307fc26ff9] to [8fa5b4578c].
| ︙ | ︙ | |||
10 11 12 13 14 15 16 |
CCROOTBIN="${CCROOT}/bin"
PATH="$(pwd)/build/fake-bin:${CCROOT}/${CROSS}/bin:${PATH}:${CCROOTBIN}"
AR="${CCROOTBIN}/${CROSS}-ar"
CC="${CCROOTBIN}/${CROSS}-gcc ${CC_ADD}"
CXX="${CCROOTBIN}/${CROSS}-g++ ${CC_ADD}"
RANLIB="${CCROOTBIN}/${CROSS}-ranlib"
| > | > | 10 11 12 13 14 15 16 17 18 19 20 21 22 |
CCROOTBIN="${CCROOT}/bin"
PATH="$(pwd)/build/fake-bin:${CCROOT}/${CROSS}/bin:${PATH}:${CCROOTBIN}"
AR="${CCROOTBIN}/${CROSS}-ar"
CC="${CCROOTBIN}/${CROSS}-gcc ${CC_ADD}"
CXX="${CCROOTBIN}/${CROSS}-g++ ${CC_ADD}"
RANLIB="${CCROOTBIN}/${CROSS}-ranlib"
if [ -z "${STRIP}" ]; then
STRIP="${CCROOTBIN}/${CROSS}-strip"
fi
export PATH AR CC CXX RANLIB STRIP
./kitcreator "$@" --host="${CROSS}"
|
Modified build/make-kit-mipsel from [ce8f51c4c1] to [6dd0ab095f].
1 2 | #! /bin/sh | < < < | | 1 2 3 4 5 6 7 8 9 10 11 |
#! /bin/sh
PATH="${PATH}:/home/rkeene/root/cross-compilers/mipsel-unknown-linux-uclibc/bin"
AR=mipsel-unknown-linux-uclibc-ar
CC=mipsel-unknown-linux-uclibc-gcc
CXX=mipsel-unknown-linux-uclibc-g++
RANLIB=mipsel-unknown-linux-uclibc-ranlib
STRIP="${STRIP:-mipsel-unknown-linux-uclibc-strip}"
export PATH AR CC CXX RANLIB STRIP
./build/make-minkit "$@" --host=mipsel-unknown-linux-uclibc
|
Modified build/make-kit-win32 from [34e60fa0c9] to [248a24bff3].
1 2 3 4 5 6 7 | #! /bin/sh AR=i586-mingw32msvc-ar CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ RANLIB=i586-mingw32msvc-ranlib RC=i586-mingw32msvc-windres | | | 1 2 3 4 5 6 7 8 9 10 11 |
#! /bin/sh
AR=i586-mingw32msvc-ar
CC=i586-mingw32msvc-gcc
CXX=i586-mingw32msvc-g++
RANLIB=i586-mingw32msvc-ranlib
RC=i586-mingw32msvc-windres
STRIP="${STRIP:-i586-mingw32msvc-strip}"
export AR CC CXX RANLIB RC STRIP
./kitcreator "$@" --host=i586-mingw32msvc
|
Modified build/make-kit-win64 from [b47b5cb270] to [911c2b9643].
1 2 3 4 5 6 7 | #! /bin/sh AR=amd64-mingw32msvc-ar CC=amd64-mingw32msvc-gcc CXX=false RANLIB=amd64-mingw32msvc-ranlib RC=amd64-mingw32msvc-windres | | | 1 2 3 4 5 6 7 8 9 10 11 |
#! /bin/sh
AR=amd64-mingw32msvc-ar
CC=amd64-mingw32msvc-gcc
CXX=false
RANLIB=amd64-mingw32msvc-ranlib
RC=amd64-mingw32msvc-windres
STRIP="${STRIP:-amd64-mingw32msvc-strip}"
export AR CC CXX RANLIB RC STRIP
./kitcreator "$@" --host=amd64-mingw32msvc --enable-64bit
|
Modified build/test/publish-tests from [0064c718f9] to [fa9eba4e6c].
| ︙ | ︙ | |||
57 58 59 60 61 62 63 |
}
return "Tcl $version for [string totitle $os] on $cpu"
}
proc pretty_print_buildinfo {buildinfo} {
set desc [list]
| | | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 |
}
return "Tcl $version for [string totitle $os] on $cpu"
}
proc pretty_print_buildinfo {buildinfo} {
set desc [list]
foreach tag [list kitdll debug min static notk nomk4 statictk unthreaded threaded zip] {
if {[lsearch -exact $buildinfo $tag] != -1} {
switch -- $tag {
"kitdll" {
lappend desc "Built as a Library"
}
"min" {
lappend desc "Minimally Built"
|
| ︙ | ︙ | |||
87 88 89 90 91 92 93 94 95 96 97 98 99 100 |
}
"unthreaded" {
lappend desc "Without Threads"
}
"zip" {
lappend desc "Kit Filesystem in Zip"
}
}
}
}
if {[llength $desc] == 0} {
return "Default Build"
}
| > > > | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 |
}
"unthreaded" {
lappend desc "Without Threads"
}
"zip" {
lappend desc "Kit Filesystem in Zip"
}
"debug" {
lappend desc "With Symbols"
}
}
}
}
if {[llength $desc] == 0} {
return "Default Build"
}
|
| ︙ | ︙ |
Modified build/test/test from [1e502acc62] to [92e44308bd].
| ︙ | ︙ | |||
63 64 65 66 67 68 69 |
Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null &
echo "$!"
)"
DISPLAY=:31
export DISPLAY
if [ "${BIGBUILD}" = "1" ]; then
| | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 |
Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null &
echo "$!"
)"
DISPLAY=:31
export DISPLAY
if [ "${BIGBUILD}" = "1" ]; then
kits="$(echo normal{,-zip,-nomk4}{,-threaded}{,-statictk,-notk} normal{,-threaded}{,-notk}{,-nomk4}{,-debug}-kitdll win32-i586{,-zip,-nomk4}{,-threaded}{,-notk} win32-i586{,-threaded}{,-notk}{,-nomk4}-kitdll min{,-static} {linux-mipsel-min,linux-amd64-notk}{,-debug}{,-kitdll} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-zip,-nomk4}{,-threaded}{,-statictk,-notk}{,debug} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-threaded}{,-notk}{,-nomk4}{,debug}-kitdll netbsd-i386{,-zip,-nomk4}{,-threaded}{,debug}-notk netbsd-i386{,-threaded}{,-nomk4}{,debug}-notk-kitdll)"
else
kits="normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 normal-debug min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll normal-debug-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll linux-mipsel-min linux-mipsel-min-kitdll linux-amd64-notk linux-amd64-notk-debug linux-amd64-notk-kitdll linux-amd64-notk-debug-kitdll solaris-i386 solaris-i386-debug solaris-i386-kitdll solaris-i386-debug-kitdll solaris-amd64 solaris-amd64-debug solaris-amd64-kitdll solaris-amd64-debug-kitdll solaris-sparc solaris-sparc-debug solaris-sparc-kitdll solaris-sparc-debug-kitdll solaris-sparc64 solaris-sparc64-debug solaris-sparc64-kitdll solaris-sparc64-debug-kitdll freebsd-amd64 freebsd-amd64-debug freebsd-amd64-kitdlli freebsd-amd64-debug-kitdll netbsd-i386-notk netbsd-i386-notk-debug netbsd-i386-notk-kitdll netbsd-i386-notk-debug-kitdll netbsd-amd64 netbsd-amd64-debug netbsd-amd64-kitdll netbsd-amd64-debug-kitdll"
fi
failed=""
for kit in $kits; do
kitcreator="./kitcreator"
args=""
runnable="1"
|
| ︙ | ︙ | |||
126 127 128 129 130 131 132 133 134 135 136 137 138 139 |
netbsd-amd64|netbsd-amd64-*|\
hpux-hppa64|hpux-hppa64-*)
platform="$(echo "${kit}" | cut -f 1-2 -d '-')"
kitcreator="./build/make-kit-${platform}"
runnable="0"
xcompile="1"
iszip="0"
;;
esac
if [ "${xcompile}" != "0" ]; then
kit="${kit}-xcompile"
fi
| > > > > | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 |
netbsd-amd64|netbsd-amd64-*|\
hpux-hppa64|hpux-hppa64-*)
platform="$(echo "${kit}" | cut -f 1-2 -d '-')"
kitcreator="./build/make-kit-${platform}"
runnable="0"
xcompile="1"
iszip="0"
if echo "${kit}" | egrep -- '-(hppa64|amd64|sparc64)-' >/dev/null; then
args="${args} --enable-64bit"
fi
;;
esac
if [ "${xcompile}" != "0" ]; then
kit="${kit}-xcompile"
fi
|
| ︙ | ︙ | |||
170 171 172 173 174 175 176 177 178 179 180 181 182 183 |
tempkit="$(echo "${tempkit}" | sed 's@-nomk4-@-@')"
nomk4="1"
iszip="1"
;;
*-kitdll-*)
kitdll="1"
;;
esac
done
if [ "${kitdll}" = "1" ]; then
# Currently no KitDLL uses Zip
iszip="0"
fi
| > > > | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 |
tempkit="$(echo "${tempkit}" | sed 's@-nomk4-@-@')"
nomk4="1"
iszip="1"
;;
*-kitdll-*)
kitdll="1"
;;
*-debug-*)
args="${args} --enable-symbols"
;;
esac
done
if [ "${kitdll}" = "1" ]; then
# Currently no KitDLL uses Zip
iszip="0"
fi
|
| ︙ | ︙ | |||
200 201 202 203 204 205 206 |
failoutputname="${TESTDIR}/kits/failed/tclkit-${version}-${kit}"
fi
buildlog="${outputname}-build.log"
failbuildlog="${failoutputname}-build.log"
testresultslog="${outputname}-tests.log"
if [ ! -f "${outputname}" ]; then
| | | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 |
failoutputname="${TESTDIR}/kits/failed/tclkit-${version}-${kit}"
fi
buildlog="${outputname}-build.log"
failbuildlog="${failoutputname}-build.log"
testresultslog="${outputname}-tests.log"
if [ ! -f "${outputname}" ]; then
unset KITCREATOR_PKGS STATICTK STRIP
if [ -f "${failoutputname}" ]; then
echo "Skipping rebuilding failed kit ${version}/${kit} ..."
failed="${failed} ${version}/${kit}-build"
continue
|
| ︙ | ︙ | |||
252 253 254 255 256 257 258 259 260 261 262 263 264 265 |
if [ "${statictk}" = "1" ]; then
STATICTK="1"
export STATICTK
echo " STATICTK=\"${STATICTK}\"" >> "${buildlog}"
echo " export STATICTK" >> "${buildlog}"
fi
if [ "${kitcreator}" != "./kitcreator" ]; then
echo " mkdir build" >> "${buildlog}"
# Several build scripts rely on minkit to work
if grep './build/make-minkit' "${kitcreator}" >/dev/null 2>/dev/null; then
echo " cat << \__EOF__ > ./build/make-minkit" >> "${buildlog}"
| > > > > > > > > | 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
if [ "${statictk}" = "1" ]; then
STATICTK="1"
export STATICTK
echo " STATICTK=\"${STATICTK}\"" >> "${buildlog}"
echo " export STATICTK" >> "${buildlog}"
fi
if echo "${args}" | grep -- '--enable-symbols' >/dev/null; then
STRIP='true'
export STRIP
echo " STRIP='true'" >> "${buildlog}"
echo " export STRIP" >> "${buildlog}"
fi
if [ "${kitcreator}" != "./kitcreator" ]; then
echo " mkdir build" >> "${buildlog}"
# Several build scripts rely on minkit to work
if grep './build/make-minkit' "${kitcreator}" >/dev/null 2>/dev/null; then
echo " cat << \__EOF__ > ./build/make-minkit" >> "${buildlog}"
|
| ︙ | ︙ |