Changeset 30625 for main

Timestamp:

2016-07-26T19:58:24+12:00 (8 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 finds vendor, as GLI or building through GLI fails if the vendor subfolder didn.

File:

• main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm (modified) (2 diffs)

main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm

@@ -576 +576 @@
     $ENV{'PERL5LIB'} = &FileUtils::filenameConcatenate($perl_home, "lib");
 
+    # add vendor\lib if it exists to PERL5LIB
+    # Strawberry Perl has a perl\vendor\lib folder. Check for it, if it exists add it to PATH for windows
+    # (Windows adds paths to library/dll files to PATH)
+    my $vendor_lib = &FileUtils::filenameConcatenate($perl_home, "vendor", "lib");
+    if(FileUtils::fileExists($vendor_lib)) {
+        &util::envvar_prepend("PATH", $vendor_lib) if $gsdlos eq "windows";
+        &util::envvar_append("PERL5LIB", $vendor_lib); 
+    }
+
     if($gsdlos eq "darwin") {
         &util::envvar_prepend("DYLD_LIBRARY_PATH", &FileUtils::filenameConcatenate($perl_home,"5.8.9","darwin-thread-multi-2level","CORE"));
@@ -590 +599 @@
     if(-e $perl_bin_dir) {
         &util::envvar_append("PATH", $perl_bin_dir);
+
+        my ($tailname,$perl_home) = File::Basename::fileparse($perl_bin_dir, "\\.(?:[^\\.]+?)\$");
+        my $vendor_lib = &FileUtils::filenameConcatenate($perl_home, "vendor", "lib");
+        if(FileUtils::fileExists($vendor_lib)) {
+        #&util::envvar_prepend("PATH", $vendor_lib) if $gsdlos eq "windows";
+        &util::envvar_append("PERL5LIB", $vendor_lib); 
+        }
     }
     }