From 70c0db910b91fb904a5004ffb3495b25b38ae898 Mon Sep 17 00:00:00 2001 From: Todd Lyons Date: Tue, 22 Oct 2013 09:52:57 -0700 Subject: [PATCH] Detect/show build feature icons --- cgi-bin/show_status.pl | 17 ++--------------- htdocs/img/postgresql-icon-32.png | Bin 0 -> 1975 bytes templates/status.tt | 13 +++++++------ 3 files changed, 9 insertions(+), 21 deletions(-) create mode 100644 htdocs/img/postgresql-icon-32.png 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 0000000000000000000000000000000000000000..807d52328f6b7161dc9ba2bc57228b54ab998ec3 GIT binary patch literal 1975 zcmV;o2T1sdP)CImS70wq9#q+Cdx(WTPsy+-}+P@``U*-p!OjTNz+tSLQ#`|NJ>f@ z;W!J#K(N=wF~%5sZLjxY@7!lj|M6@W$EB*Ga5TF*bLRa2_g}vMKL=rqiElR6H{|;( zg=$reMuYLDhHYQbR)B?4WnpDyy`;fBATZkm?k=y*%q^9)3e4N1Es-XlmP*zCA0pNJdBQ72GK6`4UyCZt;O7`se zv0|CDc-xh1An@Scp5dYXrBd~SOP}R(bGE>NY$8Y>KRSGJUw?C>zXq_fR(bovr9XX? z)zDWQ@t@mt7vI2`=wpW_B@v^d9K_yqqH>#6x@GM4S-1n$C>F^OW19o+}o!44hK zNJw1$;>*Q+ku0n$Gk50+K{5z0$k$Y8l`3lv9X#;q^*c*zn!<59q18hNd%zTfQ7LRF zq@Z94V*C2L=Q^XUef=HvJyn8*2>|kP*#H58HsIa09jpjZW?w8gdHXg5TF{)w$%;fg~7J*bu%-&lb9lLt$ySq5rhIQDZV_x7WTGVCd1<`c_4a_r0ZIry&D+$Ox zaGnJ@dxQ?1N-yckcFd-_E3CHPXN!cj6C_ zy&bLZT^=jS+QjUfN|3UwK+s5A@9Rjw9=a_a2?u?gzFGzjqOUliR+X9gWmRK8&n+#L zE-+fxqZY>H;@FRfl2f6x==7B{LDrD8L-A6Y%^A;$>#_3Y@>ZG|Nq zmjT=r)-@G#Jjsecu(HPF?v?Xp!&XgEP=OKPvEzrADXOZzUJkV+bu93nfX6U&#mRqv zUyIvj9Ds1FIVe#eP}9yh&4Z;Fhb@-vMjVvts;*h4K$w(?VFkEg=?ua~c6$C>Po#OZ zq?ne>Fn-z&2kajW?{N)v0HOgt*4_rC{~sDTFp^)?tFmdx5C^~plLgLMS2S$V$ju~h z&m^Lsjb?>_Cm^u$+KR-p9uK)QmF(&5eh6Ue=I-us9v?ZpKNAw|QYyvZyy~%WbadmBNO`|-RG<3!!D4NC^5u=Fz466Vx}~YJC6-LYw;%d2Zp`G*ynQawp7_-ZPdnFuLUA%TbM4mD=&gxV zOXB$-9{=Ftwey#6s!YHM(dHomO^nsmKb(H4wKb-wPWXZ%vpom((U%JU=I1Z^ytOk6 z%6*a`BJt2qcl9?*o{d6&Q?KY20fB3sRqz>xX#sgek=mw^{_hT2*It9{PIbsKD|i4b zd$URlG)G{!=%IbVxkkz+DU;q=7gU>(5)EEE&002ov JPDHLkV1k9m&G!HR literal 0 HcmV?d00001 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 %][% flag %] [% ELSE %][%# -- 2.30.2