Changeset 27634

Show
Ignore:
Timestamp:
17.06.2013 17:47:45 (6 years ago)
Author:
ak19
Message:

Changed order of @INC 'unshifts' due to clash over Greenstone own XMLParser.pm and XML/XPath/XMLParser. We want it to find our one first in @INC.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/buildcol.pl

    r27562 r27634  
    3535  die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'}; 
    3636  die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'}; 
     37 
     38  # Order is important. With unshift want our XMLParser to be  
     39  # found ahead of XML/XPath 
     40 
     41  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/cpan/XML/XPath'); 
     42  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/classify'); 
     43  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/plugins'); 
     44  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/cpan'); 
    3745  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib'); 
    38   unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/cpan'); 
    39   unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/cpan/XML/XPath'); 
    40   unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/plugins'); 
    41   unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/classify'); 
    4246 
    4347  if (defined $ENV{'GSDL-RUN-SETUP'})