Changeset 17733


Ignore:
Timestamp:
11/06/08 12:27:18 (13 years ago)
Author:
max
Message:

Give a better hint to search4j depending on the platform it is running in order to increase the success rate.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gli/trunk/gli.sh

    r17718 r17733  
    314314#            exit 1
    315315#        fi
    316     fi
    317 
    318     # Since search4j does not recursively search yet, the hint has been altered for now...
     316
     317    fi
     318
     319    # Give search4j a hint to find Java depending on the platform
     320    if [ $GSDLOS = "linux"] ; then
    319321    HINT=`cd ..;pwd`/packages/jre
    320     javapath=`$SEARCH4J_EXECUTABLE -e -p $HINT -m $MINIMUM_JAVA_VERSION`
     322    elif [ $GSDLOS = "darwin"] ; then
     323    HINT=/System/Library/Frameworks/JavaVM.framework/Home
     324    fi 
     325   
     326    javapath=`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`
    321327
    322328    if [ "$?" != "0" ]; then
    323329
    324         OLDVER=`$SEARCH4J_EXECUTABLE -v -p $HINT`
     330        OLDVER=`"$SEARCH4J_EXECUTABLE" -v -p "$HINT"`
    325331
    326332        if [ "$?" = "0" ]; then
Note: See TracChangeset for help on using the changeset viewer.