Changeset 23947 for main

Timestamp:

2011-04-23T17:30:21+12:00 (13 years ago)

Author:

davidb

Message:

Introduction of GSDLARCH to support linux32 and linux64 folders, if having multiple binaries in one Greenstone installation. In the event setup.bash cannont find bin/linux32 (or linux64) it sets GSDLARCH to be the empty string, thereby letting everything else continue as is used to be

File:

• main/trunk/greenstone2/setup.bash (modified) (5 diffs)

main/trunk/greenstone2/setup.bash

@@ -165 +165 @@
   export GSDLOS
 
-  PATH=$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS:$PATH
+  # Establish cpu architecture
+  # 32-bit or 64-bit?
+  UNAME_HW_MACH=`uname -m`
+
+# Original test
+#  if test "`echo x$UNAME_HW_MACH | sed 's/^x.*_64$/x/'`" == "x" ;
+#  then
+#   GSDLARCH=64
+#  else
+#   GSDLARCH=32
+#  fi
+
+  # Following test came from VirtualBox's Guest Additions autostart.sh
+  # (adapted for use in Greenstone)
+  case "$UNAME_HW_MACH" in
+    i[3456789]86|x86|i86pc)
+      GSDLARCH='32'
+      ;;
+    x86_64|amd64|AMD64)
+      GSDLARCH='64'
+      ;;
+    *)
+      echo "Unknown architecture: $UNAME_HW_MACH"
+      ;;
+  esac
+
+  # Only want non-trival GSDLARCH value set if there is evidence of
+  # the installed bin (lib, ...) directories using linux32, linux64
+  # (otherwise probably looking at an SVN compiled up version for single OS)
+  if test ! -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH" ;
+  then 
+    GSDLARCH=""
+  fi
+
+  export GSDLARCH
+
+  PATH=$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS$GSDLARCH:$PATH
   export PATH
   
   if test "$GSDLOS" = "linux" ; then
-      LD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS:$LD_LIBRARY_PATH"
+      LD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS$GSDLARCH:$LD_LIBRARY_PATH"
       export LD_LIBRARY_PATH
   elif test "$GSDLOS" = "darwin" ; then
-      DYLD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS:$DYLD_LIBRARY_PATH"
+      DYLD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS$GSDLARCH:$DYLD_LIBRARY_PATH"
       export DYLD_LIBRARY_PATH
   fi
@@ -178 +214 @@
   # Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables.
 
-if test -d "$GSDLHOME/bin/$GSDLOS/imagemagick" ; then
-    PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/bin:$PATH"
+if test -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick" ; then
+    PATH="$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick/bin:$PATH"
     export PATH
   
-    MAGICK_HOME="$GSDLHOME/bin/$GSDLOS/imagemagick"
+    MAGICK_HOME="$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick"
     export MAGICK_HOME
   
         if test "$GSDLOS" = "linux" ; then
-            LD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/lib:$LD_LIBRARY_PATH"
+            LD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick/lib:$LD_LIBRARY_PATH"
             export LD_LIBRARY_PATH
         
         elif test "$GSDLOS" = "darwin" ; then
-            DYLD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/lib:$DYLD_LIBRARY_PATH"
+            DYLD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick/lib:$DYLD_LIBRARY_PATH"
             export DYLD_LIBRARY_PATH
         fi
@@ -198 +234 @@
   # Note: Ghostscript is only bundled with Greenstone on Mac and Windows, not on Linux. The code below should be used only for the Darwin platform
   # for Windows please see setup.bat
-if test -d "$GSDLHOME/bin/$GSDLOS/ghostscript" ; then
-    PATH="$GSDLHOME/bin/$GSDLOS/ghostscript/bin":"$PATH"
+if test -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/ghostscript" ; then
+    PATH="$GSDLHOME/bin/$GSDLOS$GSDLARCH/ghostscript/bin":"$PATH"
     export PATH
   
-    GS_LIB="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/lib"
+    GS_LIB="$GSDLHOME/bin/$GSDLOS$GSDLARCH/ghostscript/share/ghostscript/8.63/lib"
     export GS_LIB
 
-    GS_FONTPATH="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/Resource/Font"
+    GS_FONTPATH="$GSDLHOME/bin/$GSDLOS$GSDLARCH/ghostscript/share/ghostscript/8.63/Resource/Font"
     export GS_FONTPATH
 fi
@@ -251 +287 @@
 if test -e apache-httpd ; then
   echo "+Adding in executable path for apache-httpd"
-  PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH
+  PATH=$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/bin:$PATH
   export PATH
 
   if test "$GSDLOS" = "linux" ; then
-      LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
+      LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/lib:$LD_LIBRARY_PATH"
       export LD_LIBRARY_PATH
   
   elif test "$GSDLOS" = "darwin" ; then
-      DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
+      DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/lib:$DYLD_LIBRARY_PATH"
       export DYLD_LIBRARY_PATH
   fi
@@ -279 +315 @@
 # if the Perl-for-greenstone tarfile has been installed in the bin/linux
 # folder, then we set things up to use that, instead of a system perl 
-if [ -d "$GSDLHOME/bin/$GSDLOS/perl" ] ; then
-
-    PATH=$GSDLHOME/bin/$GSDLOS/perl/bin:$PATH
+if [ -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl" ] ; then
+
+    PATH=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin:$PATH
     export PATH
 
     if test "$GSDLOS" = "linux" ; then
-    LD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS/perl/lib/5.8.9/i686-linux-thread-multi/CORE:$LD_LIBRARY_PATH
+    LD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/lib/5.8.9/i686-linux-thread-multi/CORE:$LD_LIBRARY_PATH
     export LD_LIBRARY_PATH
     elif test "$GSDLOS" = "darwin" ; then
-    DYLD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS/perl/lib/5.8.9/darwin-thread-multi-2level/CORE:$DYLD_LIBRARY_PATH
+    DYLD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/lib/5.8.9/darwin-thread-multi-2level/CORE:$DYLD_LIBRARY_PATH
     export DYLD_LIBRARY_PATH
     fi
 
     if [ "x$PERL5LIB" = "x" ] ; then
-    PERL5LIB=$GSDLHOME/bin/$GSDLOS/perl/lib
+    PERL5LIB=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/lib
     else 
-    PERL5LIB=$GSDLHOME/bin/$GSDLOS/perl/lib:$PERL5LIB
+    PERL5LIB=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/lib:$PERL5LIB
     fi
     export PERL5LIB