Changeset 23590 for main/trunk


Ignore:
Timestamp:
2011-01-14T18:47:45+13:00 (13 years ago)
Author:
ak19
Message:

Changed the script files that launch GS applications to contain an extra Java VM argument called Xdock:name for Darwin (MacOS) machines that will set the program abbreviation as the visible name of the top Mac menubar when the application is running in the Dock menu at the bottom.

Location:
main/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/gli/client-gli.sh

    r19769 r23590  
    1616    PROGFULLNAME=$PROGNAME
    1717fi
     18export PROGNAME
     19export PROGFULLNAME
    1820
    1921if [ "x$PROGABBR" = "x" ] ; then
    20     PROGABBR="GLI"
     22    PROGABBR="Client-GLI"
    2123fi
     24export PROGABBR
    2225
    2326if [ "x$PROGNAME_EN" = "x" ] ; then
    24     PROGNAME_EN="Greenstone Librarian Interface"
     27    PROGNAME_EN="Greenstone Librarian Interface - Remote Client"
    2528fi
     29export PROGNAME_EN
    2630
    2731# we're running GLI (or FLI) in client mode
    … …  
    132136# -Xloggc:<file>   Write garbage collection log
    133137
     138# -Xdock:name      To set the name of the app in the MacOS Dock bar
     139# -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)   
     140custom_vm_args=""
     141if [ "$GSDLOS" = "darwin" ]; then
     142    custom_vm_args="-Xdock:name=$PROGABBR"
     143fi
     144
    134145# GS2 only requires -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar. GS3 requires more but it doesn't conflict with GS2:
    135146if [ "$local_gs" = "false" ]; then
    136147    echo "Since there's no GSDLHOME, client-GLI's download panel will be deactivated."
    137148    echo
    138     $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone $*
     149    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar $custom_vm_args org.greenstone.gatherer.GathererProg -use_remote_greenstone $*
    139150else
    140151    gsdlos=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    … …  
    146157    echo "Downloading is enabled."
    147158    echo
    148     $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl "$GSDLHOME" -gsdlos $gsdlos $*
     159    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar $custom_vm_args org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl "$GSDLHOME" -gsdlos $gsdlos $*
    149160fi
    150161

  • main/trunk/gli/gems.sh

    r22336 r23590  
    105105# -Xloggc:<file>   Write garbage collection log
    106106
     107# -Xdock:name      To set the name of the app in the MacOS Dock bar
     108# -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)   
     109custom_vm_args=""
     110if [ "$GSDLOS" = "darwin" ]; then
     111    custom_vm_args="-Xdock:name=$PROGABBR"
     112fi
     113
    107114# basic_command is the cmd string common to both Greenstone 3 and Greenstone 2 execution
    108115# (gs3 doesn't -gsdl3src $GSDL3SRCHOME passed to it, it needs $GSDL3HOME to find the collect dir)
    109 basic_command="$javapath -classpath classes/:GLI.jar:lib/apache.jar org.greenstone.gatherer.gems.GEMS"
     116basic_command="$javapath -classpath classes/:GLI.jar:lib/apache.jar $custom_vm_args org.greenstone.gatherer.gems.GEMS"
    110117
    111118if [ "$_version" -eq 2 ]; then

  • main/trunk/gli/gli.sh

    r22409 r23590  
    143143    # -Xprof           Function call profiling
    144144    # -Xloggc:<file>   Write garbage collection log
     145
     146    # -Xdock:name      To set the name of the app in the MacOS Dock bar
     147    # -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)   
     148    custom_vm_args=""
     149    if [ "$GSDLOS" = "darwin" ]; then
     150        custom_vm_args="-Xdock:name=$PROGABBR"
     151    fi
    145152   
    146153    exit_status=0
    … …  
    148155# GS2 webLib
    149156    if [ "$PROGABBR" = "FLI" -o ! -f "$GSDLHOME/gs2-server.sh" ]; then
    150         "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS $*
     157        "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar $custom_vm_args org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS $*
    151158        exit_status=$?
    152159# GS2 localLib
    153160    else
    154         "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS -local_library "$GSDLHOME/gs2-server.sh" $*
     161        "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar $custom_vm_args org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS -local_library "$GSDLHOME/gs2-server.sh" $*
    155162        exit_status=$?
    156163    fi
    157164# GS3
    158165    elif [ "$_version" -eq 3 ]; then   
    159         "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS -gsdl3 "$GSDL3HOME" -gsdl3src "$GSDL3SRCHOME" $*
     166        "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar $custom_vm_args org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS -gsdl3 "$GSDL3HOME" -gsdl3src "$GSDL3SRCHOME" $*
    160167        exit_status=$?
    161168    fi

  • main/trunk/greenstone2/gs2-server.sh

    r20896 r23590  
    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
Note: See TracChangeset for help on using the changeset viewer.