Changeset 27774 for main/trunk/greenstone2/perllib/XMLParser.pm

Timestamp:

2013-07-08T17:20:54+12:00 (11 years ago)

Author:

davidb

Message:

Change to work with the Greenstone 3 release-kit/installer

File:

• main/trunk/greenstone2/perllib/XMLParser.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/XMLParser.pm

@@ -37 +37 @@
         $perl_dir="perl-5.".substr($],3,2);
     }
-    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";
     }
-    elsif ($]<5.008) {
+#    elsif ($]>=5.008) { 
+#   # perl 5.8.1 or above
+#   $perl_dir = "perl-5.8";
+#    }
+#    elsif ($]<5.008) {
+    else {
     # assume perl 5.6
     $perl_dir = "perl-5.6";
     }
-    else {
-    print STDERR "Warning: Perl 5.8.0 is not a maintained release.\n";
-    print STDERR "         Please upgrade to a newer version of Perl.\n";
-    $perl_dir = "perl-5.8";
+#    else {
+#   print STDERR "Warning: Perl 5.8.0 is not a maintained release.\n";
+#   print STDERR "         Please upgrade to a newer version of Perl.\n";
+#   $perl_dir = "perl-5.8";
+#    }
+
+
+    my $opt_bin_dir = "";
+    if (-e "$ENV{'GSDLHOME'}/perllib/cpan/XML-Parser") {
+    # Where the files end up with the Greenstone3 release-kit/installer
+
+    $opt_bin_dir = "/XML-Parser";
     }
 
-    #if ($ENV{'GSDLOS'} !~ /^windows$/i) { # test no longer necessary now cpan/auto is in cpan/perl-5.8/auto
-        # Use push to put this on the end, so an existing XML::Parser will be used by default
-        if (-d "$ENV{'GSDLHOME'}/perllib/cpan/$perl_dir-mt" && $Config{usethreads}){
-            push (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/$perl_dir-mt");
-        }
-        else{
-            push (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/$perl_dir");
-        }
-    #}
+    # Use push to put this on the end, so an existing XML::Parser will be 
+    # used by default
+
+    if (-d "$ENV{'GSDLHOME'}/perllib/cpan$opt_bin_dir/$perl_dir-mt" && $Config{usethreads}){
+    push (@INC, "$ENV{'GSDLHOME'}/perllib/cpan$opt_bin_dir/$perl_dir-mt");
+    }
+    else{
+    push (@INC, "$ENV{'GSDLHOME'}/perllib/cpan$opt_bin_dir/$perl_dir");
+    }
 }