Francois Gouget : testbot/web: Get rid of startup.pl.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: c1d7e86c75382181b12204ce962f3e9ed9006217
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=c1d7e86c75382181b12204ce962f3e9ed9006217

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Oct 25 18:13:49 2012 +0200

testbot/web: Get rid of startup.pl.

We can do the setup in the Apache configuration file instead. This way there's one less file containing the installation path.
Also CheckWineTestBot.pl does not actually hardcode the installation path these days so remove this INSTALL.txt section altogether.

---

 testbot/doc/INSTALL.txt            |    4 ----
 testbot/doc/vhost_winetestbot.conf |    8 +++++++-
 testbot/lib/startup.pl             |   26 --------------------------
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt
index 76f9aca..1cbfd83 100644
--- a/testbot/doc/INSTALL.txt
+++ b/testbot/doc/INSTALL.txt
@@ -45,10 +45,6 @@ General setup for the web site:
     mkdir jobs latest patches socket staging
     sudo chown WWWRUN:winehq staging
     chmod g+w *
-- If the installation path is different from the default, then some paths
-  in the following files will need to be modified:
-    testbot/lib/startup.pl
-    testbot/scripts/CheckWineTestBot.pl
 - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and
   user name if necessary. Then activate it.
   (typically "chkconfig winetestbot on" or "service winetestbot start")
diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf
index ca55933..9c53876 100644
--- a/testbot/doc/vhost_winetestbot.conf
+++ b/testbot/doc/vhost_winetestbot.conf
@@ -4,8 +4,14 @@
   ServerName winetestbot.example.com
   ServerAdmin winetestbot at example.com
 
-  PerlRequire /home/winehq/tools/testbot/lib/startup.pl
   PerlSwitches -Tw
+  <Perl>
+    use strict;
+    use lib qw(/home/winehq/tools/testbot/lib);
+    use ObjectModel::CGI::Page;
+    use WineTestBot::CGI::PageBase;
+    SetPageBaseCreator(\&CreatePageBase);
+  </Perl>
 
   <Directory /home/winehq/tools/testbot/web>
     AddHandler perl-script .pl
diff --git a/testbot/lib/startup.pl b/testbot/lib/startup.pl
deleted file mode 100644
index ca67505..0000000
--- a/testbot/lib/startup.pl
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2009 Ge van Geldorp
-#
-# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-use strict;
-
-use lib qw(/home/winehq/tools/testbot/lib);
-
-use ObjectModel::CGI::Page;
-use WineTestBot::CGI::PageBase;
-
-SetPageBaseCreator(\&CreatePageBase);
-
-1;