Changeset 28575

Timestamp:

2013-10-31T20:21:30+13:00 (9 years ago)

Author:

ak19

Message:

Removing the unused env_var variable from the set_gnomelib_env function introduced yesterday and commented out references to this variable in this function. Instead, doc.pm has a comment on how to set and use this env variable (if it's ever needed) before launching any binary dependent on it.

Location:

main/trunk/greenstone2/perllib

Files:

• doc.pm (modified) (1 diff)
• util.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/doc.pm

@@ -376 +376 @@
     &util::set_gnomelib_env(); # gnomelib_env (particularly lib/libiconv2.dylib) required to run the hashfile executable on Mac Lions
     # The subroutine will set the gnomelib env once for each subshell launched, by first testing if GEXTGNOME is not already set
+
+    # A different way to set the gnomelib env would be to do it more locally: exporting the necessary vars 
+    # (specifically DYLD/LD_LIB_PATH) for gnome_lib as part of the command executed. 
+    # E.g. $result=`export LD_LIBRARY_PATH=../ext/gnome-lib/darwin/lib; hashfile...`
 
     my $result = "NULL";

main/trunk/greenstone2/perllib/util.pm

@@ -1656 +1656 @@
     # Though this is only needed for darwin Lion at this point (and android, though that is untested)
 
-    my $env_vars="";
-
     my $libext = "so";
     if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
-    #return $env_vars;
     return;
     } elsif ($ENV{'GSDLOS'} =~ m/^darwin$/i) {
@@ -1689 +1686 @@
         if(-d $gnomelib_bin) { # no bin subfolder in GS binary's cutdown gnome-lib-minimal folder
         &util::envvar_prepend("PATH", $gnomelib_bin);
-        #$env_vars = "export PATH=".$ENV{'PATH'}.";";
         }
 
@@ -1697 +1693 @@
         if($ENV{'GSDLOS'} eq "linux") {
         &util::envvar_prepend("LD_LIBRARY_PATH", $gextlib);
-        #$env_vars .= "export LD_LIBRARY_PATH=".$ENV{'LD_LIBRARY_PATH'};
         } 
         elsif ($ENV{'GSDLOS'} eq "darwin") {
         #&util::envvar_prepend("DYLD_LIBRARY_PATH", $gextlib);
         &util::envvar_prepend("DYLD_FALLBACK_LIBRARY_PATH", $gextlib);
-        #$env_vars .= "export DYLD_FALLBACK_LIBRARY_PATH=".$ENV{'DYLD_FALLBACK_LIBRARY_PATH'};
         }
     }
@@ -1718 +1712 @@
     # if no GEXTGNOME, maybe users didn't need gnome-lib to run gnomelib/libiconv dependent binaries like hashfile, suffix, wget 
     # (wvware is launched in a gnomelib env from its own script, but could possibly go through this script in future)
-
-    #return $env_vars; #print STDOUT $env_vars;
 }