Changeset 25448

Show
Ignore:
Timestamp:
20.04.2012 16:28:22 (7 years ago)
Author:
ak19
Message:

When running the GS3-server.sh, it was discovered (on Ubuntu) that the Greenstone server interface failed to launch the firefox browser. This had earlier been a problem in GS2 as well, which had to do with the LD_LIBRARY_PATH environment being set to gnomelib libraries needed for wvware.pl, which then interfered with the (graphical) libraries on Ubuntu so that regular applications could not be launched from terminals where gs3-setup.sh had been run. The solution in GS2 was to introduce the wvware.pl script which would set up the environment for wvware tasks, rather than setting the environment for wvware in gs3-setup.sh. The same is now the case with gs3-setup.sh. It doesn't setup the environment for wvware anymore either as this is already handled by wvware.pl (called from gsConvert.pl by GLI). The installer required one additional related change, which was to give executable permissions to the wvWare binary, and this was committed to SVN on the previous commit.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-setup.sh

    r24335 r25448  
    160160  fi 
    161161 
    162   #wvWare 
    163   if test -d "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv"; then 
    164     if test "$GSDLOS" = "linux"; then 
    165       addtopath LD_LIBRARY_PATH "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv/lib" 
    166     elif test "$GSDLOS" = "darwin"; then 
    167       addtopath DYLD_LIBRARY_PATH "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv/lib" 
    168     fi 
    169     echo "  - Setup wvWare" 
    170   fi 
     162  #wvWare  
     163  # wvWare's environment is now set up by bin/script/wvware.pl 
     164  # The wvware.pl script can be called from the cmdline to perform wvware tasks. 
     165  # GLI calls gsConvert.pl which calls wvware.pl to similarly perform wvware tasks. 
     166#  if test -d "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv"; then 
     167#    if test "$GSDLOS" = "linux"; then 
     168#      addtopath LD_LIBRARY_PATH "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv/lib" 
     169#    elif test "$GSDLOS" = "darwin"; then 
     170#      addtopath DYLD_LIBRARY_PATH "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv/lib" 
     171#    fi 
     172#    echo "  - Setup wvWare" 
     173#  fi 
    171174 
    172175}