Changeset 20636


Ignore:
Timestamp:
2009-09-18T18:02:25+12:00 (15 years ago)
Author:
ak19
Message:

Better warning message when the findjava scripts have to resort to using what's in JAVA_HOME.

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • gli/trunk/findjava.bat

    r19353 r20636  
    5050        echo ***************************************************************************
    5151            echo WARNING:
    52         echo Found a JAVA_HOME at %JAVA_HOME%. Attempting to use this.
    53         echo However, you need to have a Java %DISPLAY_MIN_VERSION% or higher installed.
     52        echo Java Runtime not bundled with this Greenstone installation.
     53        echo Using JAVA_HOME: %JAVA_HOME%
     54        echo ^(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.^)
    5455        echo ***************************************************************************
    5556        echo.

  • gli/trunk/findjava.sh

    r20377 r20636  
    1717
    1818    # Print a warning that we're going to use whatever JAVA_HOME is set (fingers crossed)
    19     echo
    2019    if [ "x$gslang" = "x" -o "$gslang" = "en" ]; then
     20        echo
    2121        echo "***************************************************************************"
    2222        echo "WARNING: "
    23         echo "Found a JAVA_HOME at $JAVA_HOME. Attempting to use this."
    24         echo "However, you need to have a Java $MIN_DISPLAY_VERSION or higher installed."
     23        echo "Java Runtime not bundled with this Greenstone installation."
     24        echo "Using JAVA_HOME: %JAVA_HOME%"
     25        echo "(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.)"
    2526        echo "***************************************************************************"
     27        echo
    2628    fi
    27     echo
    2829    echo "Java:"
    2930    echo $javapath

  • gsdl/trunk/findjava.bat

    r20391 r20636  
    5050        echo ***************************************************************************
    5151            echo WARNING:
    52         echo Found a JAVA_HOME at %JAVA_HOME%. Attempting to use this.
    53         echo However, you need to have a Java %DISPLAY_MIN_VERSION% or higher installed.
     52        echo Java Runtime not bundled with this Greenstone installation.
     53        echo Using JAVA_HOME: %JAVA_HOME%
     54        echo ^(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.^)
    5455        echo ***************************************************************************
    5556        echo.

  • gsdl/trunk/findjava.sh

    r20376 r20636  
    1717
    1818    # Print a warning that we're going to use whatever JAVA_HOME is set (fingers crossed)
    19     echo
    2019    if [ "x$gslang" = "x" -o "$gslang" = "en" ]; then
     20        echo
    2121        echo "***************************************************************************"
    2222        echo "WARNING: "
    23         echo "Found a JAVA_HOME at $JAVA_HOME. Attempting to use this."
    24         echo "However, you need to have a Java $MIN_DISPLAY_VERSION or higher installed."
     23        echo "Java Runtime not bundled with this Greenstone installation."
     24        echo "Using JAVA_HOME: %JAVA_HOME%"
     25        echo "(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.)"
    2526        echo "***************************************************************************"
     27        echo
    2628    fi
    27     echo
    2829    echo "Java:"
    2930    echo $javapath
Note: See TracChangeset for help on using the changeset viewer.