Changeset 20655 for gli

Show
Ignore:
Timestamp:
21.09.2009 14:29:59 (10 years ago)
Author:
ak19
Message:

Updated in sync with the changes Katherine just made to gs2-server.sh and findjava.sh (JAVA_HOME\bin added to the PATH) before launching the webserver so that apache can pass it on to the lucene indexers.

Location:
gli/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/findjava.bat

    r20636 r20655  
    11@echo off 
    22 
    3 :: Environment Variables passed in: _VERSION, GLILANG and  
    4 :: possibly also GSDLHOME and/or GSDL3SRCHOME. 
    5 :: As a result of executing this script, the JAVA_EXECUTABLE variable  
    6 :: will be set, but only if Perl was found. 
     3:: Environment Variables passed in: _VERSION, GLILANG and possibly also 
     4:: GSDLHOME and/or GSDL3SRCHOME. 
     5:: As a result of executing this script, the JAVA_EXECUTABLE and GS_JAVA_HOME 
     6:: environment variables will be set, but only if Perl was found. 
    77 
    88:findJava 
     
    4040    echo. 
    4141 
    42 :: found java, JAVA_EXECUTABLE env var set, can exit this script 
     42    :: we know that works, so we can set the local javahome (for Greenstone) as well 
     43    "%SEARCH4J_EXECUTABLE%" -m "%MIN_VERSION%" -p "%HINT%" | winutil\setvar.exe GS_JAVA_HOME > %TMP%\set_java_home.bat 
     44    call "%TMP%\set_java_home.bat" 
     45    del "%TMP%\set_java_home.bat" 
     46 
     47:: found java, JAVA_EXECUTABLE and GS_JAVA_HOME env vars set, can exit this script 
    4348    goto exit 
    4449 
     
    5863    :: Try to use this version 
    5964    set JAVA_EXECUTABLE=%JAVA_HOME%\bin\java 
     65    set GS_JAVA_HOME=%JAVA_HOME% 
    6066    goto exit 
    6167 
  • gli/trunk/findjava.sh

    r20636 r20655  
    1515    # There is a JAVA_HOME already set, we're going to try using that 
    1616    javapath="$JAVA_HOME/bin/java" 
    17  
     17    javahome="$JAVA_HOME" 
    1818    # Print a warning that we're going to use whatever JAVA_HOME is set (fingers crossed) 
    1919    if [ "x$gslang" = "x" -o "$gslang" = "en" ]; then 
     
    7575     
    7676    javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`" 
     77    javahome="`"$SEARCH4J_EXECUTABLE" -p "$HINT" -m $MINIMUM_JAVA_VERSION`" 
    7778 
    7879    if [ "$?" != "0" ]; then