Check-in [8563b223da]
Overview
Comment:Updated to include build script in build log

Updated to include size of kit in published data

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:8563b223da6164eeafddd7f1bd105b62372d8e1f
User & Date: rkeene on 2010-09-26 04:47:05
Other Links: manifest | tags
Context
2010-09-26
04:47
Updated to invert the meaning of "threaded" when building CVS HEAD (which is threaded by default) in test suite (does not affect behaviour of KitCreator commands) check-in: 6c627203b1 user: rkeene tags: trunk
04:47
Updated to include build script in build log

Updated to include size of kit in published data check-in: 8563b223da user: rkeene tags: trunk

04:47
Replaced publish-tests script with HTML'ified Tcl version check-in: 824e5d844d user: rkeene tags: trunk
Changes

Modified build/test/publish-tests from [b70c6b112e] to [343dd2d6d2].

    68     68   
    69     69   	return [join $desc {, }]
    70     70   }
    71     71   
    72     72   proc pretty_print_size {size} {
    73     73   	foreach unit [list "" K M G T P] {
    74     74   		if {$size < 1024} {
           75  +			if {$size < 10} {
           76  +				set size [expr {round($size * 10) / 10.0}]
           77  +			} else {
           78  +				set size [expr {round($size)}]
           79  +			}
           80  +
    75     81   			return "$size [string trim ${unit}B]"
    76     82   		}
    77     83   
    78         -		set size [expr {${size} / 1024}]
           84  +		set size [expr {${size} / 1024.000}]
    79     85   	}
    80     86   }
    81     87   
    82     88   ##########################################################################
    83     89   ## MAIN BODY #############################################################
    84     90   ##########################################################################
    85     91   
................................................................................
   155    161   puts $fd "    <title>KitCreator Build Status</title>"
   156    162   puts $fd "  </head>"
   157    163   puts $fd "  <body>"
   158    164   puts $fd "    <table cellpadding=\"2\" border=\"1\">"
   159    165   foreach key [lsort -dictionary [array names allkitinfo]] {
   160    166   	puts $fd "      <tr>"
   161    167   	puts $fd "        <th><u>Tclkit for [pretty_print_key $key]</u></th>"
          168  +	puts $fd "        <th>Kit Size</th>"
   162    169   	puts $fd "        <th>Status</th>"
   163    170   	puts $fd "        <th>Log</th>"
   164    171   	puts $fd "        <th>Failed Tests</th>"
   165    172   	puts $fd "      </tr>"
   166    173   	foreach kitinfo_list $allkitinfo($key) {
   167    174   		puts $fd "      <tr>"
   168    175   		unset -nocomplain kitinfo
................................................................................
   195    202   			}
   196    203   
   197    204   			lappend failedtestshtml "<small><a href=\"$test\">$testname</a></small>"
   198    205   		}
   199    206   
   200    207   
   201    208   		puts $fd "        <td><a href=\"$kitinfo(file)\">[pretty_print_buildinfo $kitinfo(buildflags)]</a></td>"
          209  +		puts $fd "        <td>[pretty_print_size [file size [file join $WEBDIR $kitinfo(file)]]]</td>"
   202    210   		puts $fd "        <td bgcolor=\"$bgcolor\">$status</td>"
   203    211   		puts $fd "        <td><small><a href=\"$kitinfo(buildfile)\">([pretty_print_size [file size [file join $WEBDIR $kitinfo(buildfile)]]])</a></small></td>"
   204    212   		puts $fd "        <td>[join $failedtestshtml {, }]</td>"
   205    213   		puts $fd "      </tr>"
   206    214   	}
   207    215   
   208    216   }
   209    217   puts $fd "    </table>"
   210    218   puts $fd "  </body>"
   211    219   puts $fd "</html>"
   212    220   
   213    221   close $fd

Modified build/test/test from [88b3d324b1] to [014dfa22c8].

   128    128   
   129    129   				failed="${failed} ${version}/${kit}-build"
   130    130   
   131    131   				continue
   132    132   			fi
   133    133   
   134    134   			echo "Creating Tclkit ${version}/${kit}..."
          135  +			echo " *** Build started $(whoami)@$(hostname) on $(date)" > "${buildlog}"
          136  +			echo '' >> "${buildlog}"
          137  +			echo " *** Build Script" >> "${buildlog}"
   135    138   
   136    139   			if [ "${notk}" = "1" ]; then
   137    140   				KITCREATOR_PKGS='itcl mk4tcl'
   138    141   				export KITCREATOR_PKGS
          142  +
          143  +				echo "  KITCREATOR_PKGS=\"${KITCREATOR_PKGS}\"" >> "${buildlog}"
          144  +				echo "  export KITCREATOR_PKGS" >> "${buildlog}"
   139    145   			fi
   140    146   
   141    147   			if [ "${statictk}" = "1" ]; then
   142    148   				STATICTK="1"
   143    149   				export STATICTK
          150  +
          151  +				echo "  STATICTK=\"${STATICTK}\"" >> "${buildlog}"
          152  +				echo "  export STATICTK" >> "${buildlog}"
   144    153   			fi
          154  +
          155  +			if [ "${kitcreator}" != "./kitcreator" ]; then
          156  +				echo "  mkdir build" >> "${buildlog}"
          157  +
          158  +				# Several build scripts rely on minkit to work
          159  +				if grep './build/make-minkit' "${kitcreator}" >/dev/null 2>/dev/null; then
          160  +					echo "  cat << \__EOF__ > ./build/make-minkit" >> "${buildlog}"
          161  +					sed 's@^@  @'  './build/make-minkit' >> "${buildlog}"
          162  +					echo "  __EOF__" >> "${buildlog}"
          163  +					echo '' >> "${buildlog}"
          164  +				fi
          165  +				echo "  cat << \__EOF__ > ${kitcreator}" >> "${buildlog}"
          166  +				sed 's@^@  @'  "${kitcreator}" >> "${buildlog}"
          167  +				echo "  __EOF__" >> "${buildlog}"
          168  +				echo '' >> "${buildlog}"
          169  +			fi
          170  +			echo "  \"${kitcreator}\" \"${version}\" ${args}" >> "${buildlog}"
          171  +			echo '' >> "${buildlog}"
          172  +			echo '' >> "${buildlog}"
          173  +			echo '' >> "${buildlog}"
          174  +			echo " *** Build Results" >> "${buildlog}"
          175  +			echo '' >> "${buildlog}"
   145    176   
   146    177   			buildfailed="0"
   147         -			"${kitcreator}" "${version}" ${args} > "${buildlog}" 2>&1 || buildfailed="1"
          178  +			"${kitcreator}" "${version}" ${args} >> "${buildlog}" 2>&1 || buildfailed="1"
   148    179   			grep -n '^' */build.log >> "${buildlog}" 2>&1
   149    180   
   150    181   			if [ ! -f "${createdkit}" ]; then
   151    182   				echo "Failed to create kit ${version}/${kit}" >&2
   152    183   
   153    184   				failed="${failed} ${version}/${kit}-build"
   154    185