New server, FileBin instead of $ENV{BFConfDir}, and custom Captcha
[buildfarm-server.git] / cgi-bin / show_status.pl
index ac947c887b3e0de1adb2d32c6c247d547d2fce10..f371bdc9a186783b15c32fe3551fb4ca3eba0f48 100755 (executable)
@@ -15,8 +15,8 @@ use CGI;
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport $template_dir);
 
-
-require "$ENV{BFConfDir}/BuildFarmWeb.pl";
+use FindBin qw($RealBin);
+require "$RealBin/../BuildFarmWeb.pl";
 
 my $query = new CGI;
 my @members = $query->param('member');
@@ -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;