Changeset 25448 for main/trunk

Timestamp:

2012-04-20T16:28:22+12:00 (12 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.

File:

• main/trunk/greenstone3/gs3-setup.sh (modified) (1 diff)

main/trunk/greenstone3/gs3-setup.sh

@@ -160 +160 @@
   fi
 
-  #wvWare
-  if test -d "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv"; then
-    if test "$GSDLOS" = "linux"; then
-      addtopath LD_LIBRARY_PATH "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv/lib"
-    elif test "$GSDLOS" = "darwin"; then
-      addtopath DYLD_LIBRARY_PATH "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv/lib"
-    fi
-    echo "  - Setup wvWare"
-  fi
+  #wvWare 
+  # wvWare's environment is now set up by bin/script/wvware.pl
+  # The wvware.pl script can be called from the cmdline to perform wvware tasks.
+  # GLI calls gsConvert.pl which calls wvware.pl to similarly perform wvware tasks.
+#  if test -d "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv"; then
+#    if test "$GSDLOS" = "linux"; then
+#      addtopath LD_LIBRARY_PATH "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv/lib"
+#    elif test "$GSDLOS" = "darwin"; then
+#      addtopath DYLD_LIBRARY_PATH "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/wv/lib"
+#    fi
+#    echo "  - Setup wvWare"
+#  fi
 
 }