From: Todd Lyons <tlyons@exim.org>
Date: Tue, 22 Oct 2013 16:52:57 +0000 (-0700)
Subject: Detect/show build feature icons
X-Git-Url: https://git.exim.org/buildfarm-server.git/commitdiff_plain/70c0db910b91fb904a5004ffb3495b25b38ae898

Detect/show build feature icons
---

diff --git a/cgi-bin/show_status.pl b/cgi-bin/show_status.pl
index ac947c8..04c918c 100755
--- a/cgi-bin/show_status.pl
+++ b/cgi-bin/show_status.pl
@@ -65,21 +65,8 @@ while (my $row = $sth->fetchrow_hashref)
     next if (@members && ! grep {$_ eq $row->{sysname} } @members);
     $row->{build_flags}  =~ s/^\{(.*)\}$/$1/;
     $row->{build_flags}  =~ s/,/ /g;
-	# enable-integer-datetimes is now the default
-	if ($row->{branch} eq 'HEAD' || $row->{branch} gt 'REL8_3_STABLE')
-	{
-		$row->{build_flags} .= " --enable-integer-datetimes "
-			unless ($row->{build_flags} =~ /--(en|dis)able-integer-datetimes/);
-	}
-	# enable-thread-safety is now the default
-	if ($row->{branch} eq 'HEAD' || $row->{branch} gt 'REL8_5_STABLE')
-	{
-		$row->{build_flags} .= " --enable-thread-safety "
-			unless ($row->{build_flags} =~ /--(en|dis)able-thread-safety/);
-	}
-    $row->{build_flags}  =~ s/--((enable|with)-)?//g;
-	$row->{build_flags} =~ s/libxml/xml/;
-    $row->{build_flags}  =~ s/\S+=\S+//g;
+    $row->{build_flags}  =~ s/_PC\b//g;
+    $row->{build_flags} = lc($row->{build_flags});
     push(@$statrows,$row);
 }
 $sth->finish;
diff --git a/htdocs/img/postgresql-icon-32.png b/htdocs/img/postgresql-icon-32.png
new file mode 100644
index 0000000..807d523
Binary files /dev/null and b/htdocs/img/postgresql-icon-32.png differ
diff --git a/templates/status.tt b/templates/status.tt
index d9a64c1..0a027cb 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -8,12 +8,14 @@ See accompanying License file for license details
 [%
  flag_imgs = {
      perl = '/img/camel.png',
-     #python = '/img/python.png',
-     #debug = '/img/bug.png',
-     #pam => '/img/pam.png',
-     #cassert => '/img/cassert.png',
      openssl => '/img/ssl_icon.gif',
      gnutls => '/img/gnutls_icon.gif',
+     mysql => '/img/mysql_logo.png',
+     pgsql => '/img/postgresql-icon-32.png',
+     #python => '/img/python.png',
+     #debug => '/img/bug.png',
+     #pam => '/img/pam.png',
+     #cassert => '/img/cassert.png',
      #nls => '/img/translateicon.gif',
      #krb5 => '/img/krb.gif',
      #gssapi => '/img/gssapi.gif',
@@ -21,8 +23,7 @@ See accompanying License file for license details
      #vpath => '/img/vpath.png',
      #xml => '/img/xml.png',
      #'thread-safety' => '/img/threads.gif',
-     #'integer-datetimes' = '/img/days.png',
-     mysql = '/img/mysql_logo.png',
+     #'integer-datetimes' => '/img/days.png',
      }
 -%]
 [%- BLOCK img ; IF flag == 'depend' or flag == 'gnu-ld' ; ; ELSIF flag_imgs.$flag %]<img src="[% flag_imgs.$flag %]" title="[% flag %]" alt="[% flag %]" height="16" width="16" class="inline" align="bottom" />  [% ELSE %][%#