Overview
Comment: | Updated to produce Tclkits that lack Mk4 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 266a96d1d3b89f7942624002acab9182f98e392a |
User & Date: | rkeene on 2010-09-26 04:48:35 |
Other Links: | manifest | tags |
Context
2010-09-26
| ||
04:48 | Added echo lines for every "configure", and "make" check-in: 12600639d9 user: rkeene tags: trunk | |
04:48 | Updated to produce Tclkits that lack Mk4 check-in: 266a96d1d3 user: rkeene tags: trunk | |
04:48 | Updated locale test to use LC_ALL since dietlibc's setlocale() ignores LANG check-in: 0d9a6198ae user: rkeene tags: trunk | |
Changes
Modified build/test/publish-tests from [a10ea41136] to [fdfea000f2].
57 57 } 58 58 59 59 return "Tcl $version for [string totitle $os] on $cpu" 60 60 } 61 61 62 62 proc pretty_print_buildinfo {buildinfo} { 63 63 set desc [list] 64 - foreach tag [list min static notk statictk unthreaded threaded zip] { 64 + foreach tag [list min static notk nomk4 statictk unthreaded threaded zip] { 65 65 if {[lsearch -exact $buildinfo $tag] != -1} { 66 66 switch -- $tag { 67 67 "min" { 68 68 lappend desc "Minimally Built" 69 69 } 70 70 "static" { 71 71 lappend desc "Statically Linked" 72 72 } 73 73 "notk" { 74 74 lappend desc "Without Tk" 75 75 } 76 + "nomk4" { 77 + lappend desc "Without Metakit4" 78 + } 76 79 "statictk" { 77 80 lappend desc "Tk linked to Kit" 78 81 } 79 82 "threaded" { 80 83 lappend desc "Threaded" 81 84 } 82 85 "unthreaded" {
Modified build/test/test from [6b4cd9a999] to [648b46f86c].
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-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk linux-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 normal-nomk4 min min-static win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 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 + nomk4="0" 55 56 56 57 # Handle base configuration 57 58 os="$(uname -s | dd conv=lcase 2>/dev/null)" 58 59 cpu="$(uname -m | dd conv=lcase 2>/dev/null)" 59 60 case "${kit}" in 60 61 normal|normal-*) 61 62 kit="$(echo "${kit}" | sed "s@^normal@$os-$cpu@")" ................................................................................ 113 114 tempkit="$(echo "${tempkit}" | sed 's@-notk-@-@')" 114 115 if [ "${statictk}" = "0" ]; then 115 116 notk="1" 116 117 else 117 118 echo "${kit}: Unable to create StaticTk and NoTk, ignoring NoTk" >&2 118 119 fi 119 120 ;; 121 + *-nomk4-*) 122 + tempkit="$(echo "${tempkit}" | sed 's@-nomk4-@-@')" 123 + nomk4="1" 124 + iszip="1" 125 + ;; 120 126 esac 121 127 done 122 128 123 129 for version in ${VERSIONS}; do 124 130 # Work around changes in default behaviour 125 131 if [ "${version}" = "cvs_HEAD" ]; then 126 132 kit="$(echo "${kit}" | sed 's@-threaded@-unthreaded@')" ................................................................................ 149 155 echo "Creating Tclkit ${version}/${kit}..." 150 156 echo " *** Build started $(whoami)@$(hostname) on $(date)" > "${buildlog}" 151 157 echo '' >> "${buildlog}" 152 158 echo " *** Build Script" >> "${buildlog}" 153 159 154 160 if [ "${notk}" = "1" ]; then 155 161 KITCREATOR_PKGS='itcl mk4tcl' 156 - export KITCREATOR_PKGS 162 + fi 157 163 164 + if [ "${nomk4}" = "1" ]; then 165 + if [ -z "${KITCREATOR_PKGS}" ]; then 166 + KITCREATOR_PKGS='itcl tk' 167 + else 168 + KITCREATOR_PKGS="$(echo "${KITCREATOR_PKGS}" | sed 's@mk4tcl@@')" 169 + fi 170 + fi 171 + export KITCREATOR_PKGS 172 + 173 + if [ -n "${KITCREATOR_PKGS}" ]; then 158 174 echo " KITCREATOR_PKGS=\"${KITCREATOR_PKGS}\"" >> "${buildlog}" 159 175 echo " export KITCREATOR_PKGS" >> "${buildlog}" 160 176 fi 161 177 162 178 if [ "${statictk}" = "1" ]; then 163 179 STATICTK="1" 164 180 export STATICTK