Index: build/test/publish-tests
==================================================================
--- build/test/publish-tests
+++ build/test/publish-tests
@@ -42,12 +42,12 @@
 	set version [lindex $key 0]
 	set os [lindex $key 1]
 	set cpu [lindex $key 2]
 
 	switch -glob -- $version {
-		"cvs_HEAD" {
-			set version "from CVS HEAD"
+		"cvs_HEAD" - "fossil_trunk" {
+			set version "from Fossil trunk tip"
 		}
 		"cvs_*" {
 			set tag [join [lrange [split $version _] 1 end] _]
 			set version "from CVS tag $tag"
 		}
@@ -57,14 +57,18 @@
 	}
 
 	return "Tcl $version for [string totitle $os] on $cpu"
 }
 
-proc pretty_print_buildinfo {buildinfo} {
+proc pretty_print_buildinfo {buildinfo {rettype "desc"}} {
 	set desc [list]
+	set tags [list]
+
 	foreach tag [list kitdll debug min static notk nomk4 statictk unthreaded threaded zip] {
 		if {[lsearch -exact $buildinfo $tag] != -1} {
+			set pre_desc $desc
+
 			switch -- $tag {
 				"kitdll" {
 					lappend desc "Built as a Library"
 				}
 				"min" {
@@ -93,18 +97,29 @@
 				}
 				"debug" {
 					lappend desc "With Symbols"
 				}
 			}
+
+			if {$desc != $pre_desc} {
+				lappend tags $tag
+			}
 		}
 	}
 
 	if {[llength $desc] == 0} {
 		return "Default Build"
 	}
 
-	return [join $desc {, }]
+	switch -- $rettype {
+		"desc" {
+			return [join $desc {, }]
+		}
+		"tag" {
+			return $tags
+		}
+	}
 }
 
 proc pretty_print_size {size} {
 	foreach unit [list "" K M G T P] {
 		if {$size < 1024} {
@@ -126,11 +141,14 @@
 ##########################################################################
 
 file delete -force -- $WEBDIR
 file mkdir $WEBDIR
 
-set fd [open [file join $WEBDIR index.html] w]
+set index_html_filename [file join $WEBDIR index.html]
+set index_tcl_filename [file join $WEBDIR index.tcl]
+
+set fd [open "${index_html_filename}.new" w]
 
 file copy -force -- {*}[glob kits/*] $WEBDIR
 
 set totaltests_count [llength [glob tests/*.tcl]]
 
@@ -345,5 +363,12 @@
 puts $fd "    <p>Generated on [clock format [clock seconds] -format {%Y%m%dT%H%M%SZ} -timezone :UTC]</p>"
 puts $fd "  </body>"
 puts $fd "</html>"
 
 close $fd
+
+set tfd [open "${index_tcl_filename}.new" w]
+puts $tfd [array get allkitinfo]
+close $tfd
+
+file rename -force -- "${index_html_filename}.new" $index_html_filename
+file rename -force -- "${index_tcl_filename}.new" $index_tcl_filename