Changeset 20933

Timestamp:

2009-11-12T14:41:39+13:00 (14 years ago)

Author:

oranfry

Message:

modifications to environment vars LD_LIBRARY_PATH and PATH relating to wvWare on linux to be done in a narrower scope. this also fixes a probable bug which would have stopped the newer wvWare being used

Location:

gsdl/trunk

Files:

• bin/script/gsConvert.pl (modified) (1 diff)
• setup.bash (modified) (1 diff)

gsdl/trunk/bin/script/gsConvert.pl

@@ -494 +494 @@
     ($input_filename, $output_filestem) = @_;
 
-    my $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin", 
-                     $ENV{'GSDLOS'}, "wvWare");
+    my $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wvWare");
+
+    if ( -d "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}/wv" && $ENV{'GSDLOS'} eq "linux" ) {
+        $ENV{'PATH'} = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}/wv/bin:$ENV{'PATH'}";
+        $ENV{'LD_LIBRARY_PATH'} = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}/wv/lib:$ENV{'LD_LIBRARY_PATH'}";
+        $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wv", "bin", "wvWare");
+    }
 
     # don't include path on windows (to avoid having to play about

gsdl/trunk/setup.bash

@@ -158 +158 @@
   export GSDLOS
 
-  PATH=$GSDLHOME/bin/$GSDLOS/wv/bin:$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS:$PATH
+  PATH=$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS:$PATH
   export PATH
   
-  # Allow wvWare binary to find the required libraries.
-        if test "$GSDLOS" = "linux" ; then
-            LD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/wv/lib:$LD_LIBRARY_PATH"
-            export LD_LIBRARY_PATH
-        
-        elif test "$GSDLOS" = "darwin" ; then
-            DYLD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/wv/lib:$DYLD_LIBRARY_PATH"
-            export DYLD_LIBRARY_PATH
-        fi
-
-  
-  
+ 
   # Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables.