[2/2] patches: Use the results from the local WineTestBot.

[Francois Gouget]

This turns on the switch allowing WineTestBot to send its results to the patches website and removes the no longer needed patches scripts.
---

*WARNING*: This second patch is not meant to be committed right away as 
it removes the email-based integration with the old WineTestBot. I'm 
mostly sending it now for documentation purposes. Also this way there 
will be a ready reference to it the day we switch to the new WineTestBot 
(I'll certainly resend it anyway).


 patches/doc/INSTALL.txt    |   12 ++-----
 patches/filter-testbot     |   83 --------------------------------------------
 patches/notify-bot         |   35 -------------------
 testbot/bin/WineSendLog.pl |    2 +-
 4 files changed, 3 insertions(+), 129 deletions(-)
 delete mode 100755 patches/filter-testbot
 delete mode 100755 patches/notify-bot

diff --git a/patches/doc/INSTALL.txt b/patches/doc/INSTALL.txt
index 86b3dca..c1570ac 100644
--- a/patches/doc/INSTALL.txt
+++ b/patches/doc/INSTALL.txt
@@ -58,16 +58,8 @@ Apache setup:
 - Run expire regularly to delete old patches:
     0 0 * * * $HOME/tools/patches/expire -v $HOME/patches
 
-To integrate with the WineTestBot also do the following:
-- Run the notify-bot script regularly to notify the WineTestBot when there are
-  new patches to test.
-    */5 * * * * $HOME/tools/patches/notify-bot <winetestbot-email-address>
-- Arrange for the filter-testbot script to be fed the WineTestBot emails. One
-  way to do so is to add the following lines to the .procmailrc file:
-    :0 bfw
-    * ^X-TestBot-Results:
-    | $HOME/tools/patches/filter-testbot
-
+For integration with the WineTestBot, see the corresponding section in the
+WineTestBot documentation.
 
 
 5. Setup for the regressions site
diff --git a/patches/filter-testbot b/patches/filter-testbot
deleted file mode 100755
index 844090c..0000000
--- a/patches/filter-testbot
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Process a testbot result email and generate the .testfail and .testbot
-# result files that the patches site uses / links to.
-#
-# Copyright 2010 Alexandre Julliard
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-use strict;
-
-my $step = 0;
-my $patch = 0;
-my $failed = 0;
-
-while (<>)
-{
-    if (/^--- BEGIN GENERAL ---$/)
-    {
-        $step = 1;
-        next;
-    }
-    if (/^--- BEGIN NEW_ERRORS ---$/)
-    {
-        $step = 2;
-        next;
-    }
-    if (/^--- BEGIN FULL_LOGS ---$/)
-    {
-        $step = 3;
-        next;
-    }
-    if (/^--- END GENERAL ---$/)
-    {
-        die "no patch id found" unless $patch > 0;
-        if ($failed)
-        {
-            open TESTFAIL, ">patches/$patch.testfail" or die "cannot create $patch.testfail";
-        }
-        open TESTBOT, ">patches/$patch.testbot" or die "cannot create $patch.testbot";
-        $step = 0;
-        next;
-    }
-    if (/^--- END/)
-    {
-        $step = 0;
-        next;
-    }
-    if ($step == 1 && /^Patch: (\d+)/)
-    {
-        $patch = $1;
-        next;
-    }
-    if ($step == 1 && /^Test-Result:\s+Failed/)
-    {
-        $failed = 1;
-        next;
-    }
-    if ($step == 2 && $failed)
-    {
-        print TESTFAIL $_;
-        next;
-    }
-    if ($step == 3)
-    {
-        print TESTBOT $_;
-        next;
-    }
-}
-close TESTFAIL if $failed;
-close TESTBOT;
diff --git a/patches/notify-bot b/patches/notify-bot
deleted file mode 100755
index 9676c42..0000000
--- a/patches/notify-bot
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# Send an email to the WineTestBot to let it know of new patches.
-#
-# Copyright 2010 Alexandre Julliard
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-notify_addr="$1"
-subject="New patches available at http://source.winehq.org/patches"
-test -n "$notify_addr" || exit 0
-
-old=`cat $HOME/.next-patch`
-next=$old
-while test -f /home/winehq/opt/source/patches/data/$next
-do
-    next=`expr $next + 1`
-done
-if test $next -gt $old
-then
-    echo $next >$HOME/.next-patch
-    echo "The latest patch is `expr $next - 1`" | Mail -s "$subject" "$notify_addr"
-fi
diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index ac522c1..f345ebe 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -447,7 +447,7 @@ EOF
   }
 
   my $Patch = $Job->Patch;
-  if (0 and defined $Patch->WebPatchId and -d "$DataDir/webpatches")
+  if (defined $Patch->WebPatchId and -d "$DataDir/webpatches")
   {
     my $BaseName = "$DataDir/webpatches/" . $Patch->WebPatchId;
     if ($Messages)
-- 
1.7.10.4