Changeset 23594

Timestamp:

2011-01-15T15:22:57+13:00 (13 years ago)

Author:

sjm84

Message:

Another set of trunk changes to commit to this branch

Location:

main/branches/64_bit_Greenstone/greenstone2

Files:

• . (modified) (1 prop)
• build-src/packages/configure (modified) (2 diffs)
• client-gli.app/Contents/Resources/AutomatorApplet.icns (modified) ( previous)
• gems.app/Contents/Resources/AutomatorApplet.icns (modified) ( previous)
• gli.app/Contents/Resources/AutomatorApplet.icns (modified) ( previous)
• gs2-server.app/Contents/Resources/AutomatorApplet.icns (modified) ( previous)
• gs2-server.sh (modified) (1 diff)
• setup.bash (modified) (2 diffs)

main/branches/64_bit_Greenstone/greenstone2/build-src/packages/configure

@@ -119 +119 @@
 ##fi
 
+libdir="${prefix}/lib/$GSDLOS"
+
 # This loads the top configure's cache file, with variables already set.
 if test -f "$cache_file" ; then
@@ -137 +139 @@
 # datadir is for default location of wvHtml.xml config file
 cd wv-gs && \
-./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS
+./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS
 
 # configure the pdftohtml converter

main/branches/64_bit_Greenstone/greenstone2/gs2-server.sh

@@ -145 +145 @@
     fi
 
+    # -Xdock:name      To set the name of the app in the MacOS Dock bar
+    # -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)    
+    custom_vm_args=""
+    if [ "$GSDLOS" = "darwin" ]; then
+        custom_vm_args="-Xdock:name=$PROGABBR"
+    fi
+
+
     if [ "x$silent" == "x" -o "x$silent" != "xtrue" ]; then 
         # verbose mode, show all output, but then we can't run the server interface in the background
     
-    "$javapath" org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $*
+    "$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $*
     else
         # If we launch the Greenstone Server Interface application in the background (with & at end)
         # need to redirect any STDERR (STDOUT) output to /dev/null first, else output will hog the x-term.
-    "$javapath" org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $* > /dev/null &
+    "$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $* > /dev/null &
     fi
 

main/branches/64_bit_Greenstone/greenstone2/setup.bash

@@ -161 +161 @@
   export PATH
   
+  if test "$GSDLOS" = "linux" ; then
+      LD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS:$LD_LIBRARY_PATH"
+      export LD_LIBRARY_PATH
+  elif test "$GSDLOS" = "darwin" ; then
+      DYLD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS:$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.
@@ -195 +202 @@
 fi
   
-  
+
   
   MANPATH=$MANPATH:$GSDLHOME/packages/mg/man