Diff

Differences From Artifact [c704512f53]:

To Artifact [7d17ed1d63]:


    40     40   ##########################################################################
    41     41   proc pretty_print_key {key} {
    42     42   	set version [lindex $key 0]
    43     43   	set os [lindex $key 1]
    44     44   	set cpu [lindex $key 2]
    45     45   
    46     46   	switch -glob -- $version {
    47         -		"cvs_HEAD" {
    48         -			set version "from CVS HEAD"
           47  +		"cvs_HEAD" - "fossil_trunk" {
           48  +			set version "from Fossil trunk tip"
    49     49   		}
    50     50   		"cvs_*" {
    51     51   			set tag [join [lrange [split $version _] 1 end] _]
    52     52   			set version "from CVS tag $tag"
    53     53   		}
    54     54   		default {
    55     55   			set version "version $version"
    56     56   		}
    57     57   	}
    58     58   
    59     59   	return "Tcl $version for [string totitle $os] on $cpu"
    60     60   }
    61     61   
    62         -proc pretty_print_buildinfo {buildinfo} {
           62  +proc pretty_print_buildinfo {buildinfo {rettype "desc"}} {
    63     63   	set desc [list]
           64  +	set tags [list]
           65  +
    64     66   	foreach tag [list kitdll debug min static notk nomk4 statictk unthreaded threaded zip] {
    65     67   		if {[lsearch -exact $buildinfo $tag] != -1} {
           68  +			set pre_desc $desc
           69  +
    66     70   			switch -- $tag {
    67     71   				"kitdll" {
    68     72   					lappend desc "Built as a Library"
    69     73   				}
    70     74   				"min" {
    71     75   					lappend desc "Minimally Built"
    72     76   				}
................................................................................
    91     95   				"zip" {
    92     96   					lappend desc "Kit Filesystem in Zip"
    93     97   				}
    94     98   				"debug" {
    95     99   					lappend desc "With Symbols"
    96    100   				}
    97    101   			}
          102  +
          103  +			if {$desc != $pre_desc} {
          104  +				lappend tags $tag
          105  +			}
    98    106   		}
    99    107   	}
   100    108   
   101    109   	if {[llength $desc] == 0} {
   102    110   		return "Default Build"
   103    111   	}
   104    112   
   105         -	return [join $desc {, }]
          113  +	switch -- $rettype {
          114  +		"desc" {
          115  +			return [join $desc {, }]
          116  +		}
          117  +		"tag" {
          118  +			return $tags
          119  +		}
          120  +	}
   106    121   }
   107    122   
   108    123   proc pretty_print_size {size} {
   109    124   	foreach unit [list "" K M G T P] {
   110    125   		if {$size < 1024} {
   111    126   			if {$size < 10 && $unit != ""} {
   112    127   				set size [expr {round($size * 10) / 10.0}]
................................................................................
   124    139   ##########################################################################
   125    140   ## MAIN BODY #############################################################
   126    141   ##########################################################################
   127    142   
   128    143   file delete -force -- $WEBDIR
   129    144   file mkdir $WEBDIR
   130    145   
   131         -set fd [open [file join $WEBDIR index.html] w]
          146  +set index_html_filename [file join $WEBDIR index.html]
          147  +set index_tcl_filename [file join $WEBDIR index.tcl]
          148  +
          149  +set fd [open "${index_html_filename}.new" w]
   132    150   
   133    151   file copy -force -- {*}[glob kits/*] $WEBDIR
   134    152   
   135    153   set totaltests_count [llength [glob tests/*.tcl]]
   136    154   
   137    155   foreach file [lsort -dictionary [glob -tails -directory $WEBDIR * failed/*]] {
   138    156   	set shortfile $file
................................................................................
   343    361   }
   344    362   puts $fd "    </table>"
   345    363   puts $fd "    <p>Generated on [clock format [clock seconds] -format {%Y%m%dT%H%M%SZ} -timezone :UTC]</p>"
   346    364   puts $fd "  </body>"
   347    365   puts $fd "</html>"
   348    366   
   349    367   close $fd
          368  +
          369  +set tfd [open "${index_tcl_filename}.new" w]
          370  +puts $tfd [array get allkitinfo]
          371  +close $tfd
          372  +
          373  +file rename -force -- "${index_html_filename}.new" $index_html_filename
          374  +file rename -force -- "${index_tcl_filename}.new" $index_tcl_filename