From owner-svn-src-user@FreeBSD.ORG  Sat Sep 21 22:11:10 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 276B1619;
 Sat, 21 Sep 2013 22:11:10 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 159282B86;
 Sat, 21 Sep 2013 22:11:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8LMB9Dt005362;
 Sat, 21 Sep 2013 22:11:09 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8LMB9A1005361;
 Sat, 21 Sep 2013 22:11:09 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201309212211.r8LMB9A1005361@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Sat, 21 Sep 2013 22:11:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r255771 - user/des/tinderbox/www
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Sep 2013 22:11:10 -0000

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>&nbsp;</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}}))) {