Changeset 21822 for main/trunk/greenstone2

Timestamp:

2010-03-25T21:09:50+13:00 (14 years ago)

Author:

ak19

Message:

Dr Bainbridge has fixed several perl files that depended on perl 5.8 to work and used to fail with Perl 5.10.

Location:

main/trunk/greenstone2

Files:

• bin/script/buildcol.pl (modified) (1 diff)
• bin/script/import.pl (modified) (1 diff)
• perllib/XMLParser.pm (modified) (1 diff)
• perllib/buildConfigxml.pm (modified) (1 diff)
• perllib/collConfigxml.pm (modified) (1 diff)

main/trunk/greenstone2/bin/script/buildcol.pl

@@ -31 +31 @@
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/perl-5.8");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/XML/XPath");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins");

main/trunk/greenstone2/bin/script/import.pl

@@ -36 +36 @@
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/perl-5.8");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugouts");

main/trunk/greenstone2/perllib/XMLParser.pm

@@ -8 +8 @@
 
     # Note: $] encodes the version number of perl
-    if ($]>5.008) { 
+    if ($]>=5.010) { 
+    $perl_dir = "perl-5.10";
+    }
+    elsif ($]>5.008) { 
+    # perl 5.8.1 or above
+    $perl_dir = "perl-5.8";
+    }
+    elsif ($]>=5.008) { 
     # perl 5.8.1 or above
     $perl_dir = "perl-5.8";

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -42 +42 @@
 
     # Note: $] encodes the version number of perl
-    if ($]>5.008) { 
+    if ($]>=5.010) { 
+    $perl_dir = "perl-5.10";
+    }
+    elsif ($]>5.008) { 
     # perl 5.8.1 or above
     $perl_dir = "perl-5.8";

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -38 +38 @@
 
     # Note: $] encodes the version number of perl
-    if ($]>5.008) { 
+    if ($]>=5.010) { 
+    $perl_dir = "perl-5.10";
+    }
+    elsif ($]>5.008) { 
     # perl 5.8.1 or above
     $perl_dir = "perl-5.8";