Changeset 30626

Show
Ignore:
Timestamp:
26.07.2016 19:59:45 (3 years ago)
Author:
ak19
Message:

Switch to including Strawberry Perl (v5.18) which has a vendor folder with a lib subfolder. In gsdlCGI.pm, add perl\vendor\lib to PERL5LIB (for linux) and additionally into PATH for windows, since DLL paths go into PATH for windows as there's no LIBRARY_PATH. Not sure if this is needed as it works on the cmdline without adding perl\vendor\lib or any other lib subfolder to the PATH. At that point it does still find vendor, as GLI or building through GLI fails if the vendor subfolder and contents weren't present inside the included perl.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm

    r30625 r30626  
    603603        my $vendor_lib = &FileUtils::filenameConcatenate($perl_home, "vendor", "lib"); 
    604604        if(FileUtils::fileExists($vendor_lib)) { 
    605         #&util::envvar_prepend("PATH", $vendor_lib) if $gsdlos eq "windows"; 
     605        &util::envvar_prepend("PATH", $vendor_lib) if $gsdlos eq "windows"; 
    606606        &util::envvar_append("PERL5LIB", $vendor_lib);  
    607607        }