Bug 257534: Require Perl 5.8.1 or later when running on Windows with ActiveState...

 enough version for Bugzilla on any earlier version of ActiveState Perl)
Patch by Byron Jones <bugzilla@glob.com.au>
r=justdave, a=justdave

diff --git a/checksetup.pl b/checksetup.pl
index bb28e5717472e66ebc6442a493cb993538b05315..a1a4ab11a3126ec19647c11acbf0ca5af08de313 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -150,6 +150,12 @@ if ($ARGV[0] && ($ARGV[0] !~ /^--/)) {
 #
 
 print "\nChecking perl modules ...\n" unless $silent;
+if ($^O =~ /MSWin32/i) {
+    unless ($] >= 5.008001) {
+        die "Sorry, you need at least ActiveState Perl build 5.8.1\n";
+        # for CGI 2.93 or higher
+    }
+}
 unless ($] >= 5.006) {
     die "Sorry, you need at least Perl 5.6\n";
 }
@@ -314,26 +320,11 @@ my $patchreader = have_vers("PatchReader","0.9.4");
 print "\n" unless $silent;
 
 if ($^O =~ /MSWin32/i && !$silent) {
-    if ($^V lt pack('U*',5,8,0)) {
-        # If something older than 5.8 is detected, then point to the oi
-        # repository using ppm version 2 commands (which is the default
-        # for Perl 5.6)
-
-        print "The required ActivePerl modules are available at OpenInteract's ppm repository.\n";
-        print "You can add the repository with the following command:\n";
-        print "    ppm set rep oi http://openinteract.sourceforge.net/ppmpackages/\n";
-        print "You can then save the changes by typing:\n";
-        print "    ppm set save\n\n";
-    } else {
-        # For Perl 5.8 or higher, point the user to a 5.8 repository,
-        # using ppm version 3 commands (which is the default for Perl 5.8)
-
-        print "Most ActivePerl modules are available at Apache's ppm repository.\n";
-        print "A list of mirrors is available at\n";
-        print "    http://www.apache.org/dyn/closer.cgi/perl/win32-bin/ppms/\n";
-        print "You can add the repository with the following command:\n";
-        print "    ppm rep add apache http://www.apache.org/dist/perl/win32-bin/ppms/\n\n";
-    }
+    print "Most ActivePerl modules are available at Apache's ppm repository.\n";
+    print "A list of mirrors is available at\n";
+    print "    http://www.apache.org/dyn/closer.cgi/perl/win32-bin/ppms/\n";
+    print "You can add the repository with the following command:\n";
+    print "    ppm rep add apache http://www.apache.org/dist/perl/win32-bin/ppms/\n\n";
 }
 
 if ((!$gd || !$chartbase) && !$silent) {

diff --git a/docs/rel_notes.txt b/docs/rel_notes.txt
index 1f08a22c21b435c8a61f4104c9fb058c0c7b3a3f..9327090c3b2d8156ee612d99d10063cba9a39dd7 100644 (file)
--- a/docs/rel_notes.txt
+++ b/docs/rel_notes.txt
@@ -24,7 +24,8 @@ Dependency Requirements
 Minimum software requirements:
 
   MySQL v3.23.41         (changed from 2.16)
-  Perl v5.6.0            (changed from 2.16)
+  Perl v5.6.0            (changed from 2.16)  (Non-Windows platforms)
+  ActiveState Perl v5.8.1                     (Windows only)
 
 Required Perl modules:
 

diff --git a/docs/xml/Bugzilla-Guide.xml b/docs/xml/Bugzilla-Guide.xml
index 7b4a40f53e2a54e7e7b1d8c541806848df77efb8..648f388c2c9267177af5d5016c01d68602e05bd7 100644 (file)
--- a/docs/xml/Bugzilla-Guide.xml
+++ b/docs/xml/Bugzilla-Guide.xml
@@ -44,6 +44,7 @@
 <!-- For minimum versions -->
 <!ENTITY min-mysql-ver "3.23.41">
 <!ENTITY min-perl-ver "5.6.0">
+<!ENTITY min-perl-ver-win "5.8.1">
 <!ENTITY min-template-ver "2.08">
 <!ENTITY min-file-temp-ver "any">
 <!ENTITY min-appconfig-ver "1.52">

diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index 741128ddec8f80bdff7165d54ff53153710ec915..02223f286dc5d2d5b896664152707393fbf2bc7b 100644 (file)
--- a/docs/xml/installation.xml
+++ b/docs/xml/installation.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: installation.xml,v 1.72.2.2 2004/07/25 16:33:21 bugreport%peshkin.net Exp $ -->
+<!-- $Id: installation.xml,v 1.72.2.3 2004/09/14 05:51:25 justdave%bugzilla.org Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -54,7 +54,8 @@
     <procedure>
       <step>
         <para><link linkend="install-perl">Install Perl</link>
-        (&min-perl-ver; or above)
+        (&min-perl-ver; or above for non-Windows platforms; &min-perl-ver-win;
+        for Windows)
         </para>
       </step>
       <step>