Changeset 23594 for main/branches

Show
Ignore:
Timestamp:
15.01.2011 15:22:57 (9 years ago)
Author:
sjm84
Message:

Another set of trunk changes to commit to this branch

Location:
main/branches/64_bit_Greenstone/greenstone2
Files:
8 modified

Legend:

Unmodified
Added
Removed
  • main/branches/64_bit_Greenstone/greenstone2

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

    r23508 r23594  
    119119##fi 
    120120 
     121libdir="${prefix}/lib/$GSDLOS" 
     122 
    121123# This loads the top configure's cache file, with variables already set. 
    122124if test -f "$cache_file" ; then 
     
    137139# datadir is for default location of wvHtml.xml config file 
    138140cd wv-gs && \ 
    139 ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS 
     141./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS 
    140142 
    141143# configure the pdftohtml converter 
  • main/branches/64_bit_Greenstone/greenstone2/gs2-server.sh

    r20896 r23594  
    145145    fi 
    146146 
     147    # -Xdock:name      To set the name of the app in the MacOS Dock bar 
     148    # -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)     
     149    custom_vm_args="" 
     150    if [ "$GSDLOS" = "darwin" ]; then 
     151        custom_vm_args="-Xdock:name=$PROGABBR" 
     152    fi 
     153 
     154 
    147155    if [ "x$silent" == "x" -o "x$silent" != "xtrue" ]; then  
    148156        # verbose mode, show all output, but then we can't run the server interface in the background 
    149157     
    150     "$javapath" org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $* 
     158    "$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $* 
    151159    else 
    152160        # If we launch the Greenstone Server Interface application in the background (with & at end) 
    153161        # need to redirect any STDERR (STDOUT) output to /dev/null first, else output will hog the x-term. 
    154     "$javapath" org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $* > /dev/null & 
     162    "$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $* > /dev/null & 
    155163    fi 
    156164 
  • main/branches/64_bit_Greenstone/greenstone2/setup.bash

    r22422 r23594  
    161161  export PATH 
    162162   
     163  if test "$GSDLOS" = "linux" ; then 
     164      LD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS:$LD_LIBRARY_PATH" 
     165      export LD_LIBRARY_PATH 
     166  elif test "$GSDLOS" = "darwin" ; then 
     167      DYLD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS:$DYLD_LIBRARY_PATH" 
     168      export DYLD_LIBRARY_PATH 
     169  fi 
    163170  
    164171  # Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables. 
     
    195202fi 
    196203   
    197    
     204 
    198205   
    199206  MANPATH=$MANPATH:$GSDLHOME/packages/mg/man