svn commit: r255771 - user/des/tinderbox/www

[Dag-Erling Smørgrav]

Author: des
Date: Sat Sep 21 22:11:09 2013
New Revision: 255771
URL: http://svnweb.freebsd.org/changeset/base/255771

Log:
  Support variant builds, where everything after the first hyphen in the
  config name (except for an optional -build suffix) indicates a variant.

Modified:
  user/des/tinderbox/www/index.cgi

Modified: user/des/tinderbox/www/index.cgi
==============================================================================
--- user/des/tinderbox/www/index.cgi	Sat Sep 21 22:10:02 2013	(r255770)
+++ user/des/tinderbox/www/index.cgi	Sat Sep 21 22:11:09 2013	(r255771)
@@ -84,10 +84,10 @@ sub do_config($) {
 
     my %branches = %{$CONFIGS{$config}};
 
-    my $prettyconfig = $config;
-    $prettyconfig =~ s/^(.*?)-build$/$1/;
+    $config =~ m/^(\w+)((?:-\w+)*?)(-build)?$/;
+    my $variant = join(' ', split('-', $2));
     print "      <tr class='header'>
-        <th>$prettyconfig</th>
+        <th> </th>
 ";
     foreach my $arch (sort(keys(%ARCHES))) {
 	foreach my $machine (sort(keys(%{$ARCHES{$arch}}))) {
@@ -108,7 +108,7 @@ sub do_config($) {
 	$prettybranch =~ s@^RELENG_(\d+)_(\d+)$@/releng/$1.$2@;
 	$prettybranch =~ s@^RELENG_(\d+)$@/stable/$1@;
 	print "      <tr>
-	<th>$prettybranch</th>
+	<th>$prettybranch$variant</th>
 ";
 	foreach my $arch (sort(keys(%ARCHES))) {
 	    foreach my $machine (sort(keys(%{$ARCHES{$arch}}))) {