Changeset 20655

Timestamp:

2009-09-21T14:29:59+12:00 (14 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.

Files:

• gli/trunk/findjava.bat (modified) (3 diffs)
• gli/trunk/findjava.sh (modified) (2 diffs)
• gsdl/trunk/findjava.sh (modified) (2 diffs)
• gsdl/trunk/gs2-server.bat (modified) (3 diffs)

gli/trunk/findjava.bat

@@ -1 +1 @@
 @echo off
 
-:: Environment Variables passed in: _VERSION, GLILANG and 
-:: possibly also GSDLHOME and/or GSDL3SRCHOME.
-:: As a result of executing this script, the JAVA_EXECUTABLE variable 
-:: will be set, but only if Perl was found.
+:: Environment Variables passed in: _VERSION, GLILANG and possibly also
+:: GSDLHOME and/or GSDL3SRCHOME.
+:: As a result of executing this script, the JAVA_EXECUTABLE and GS_JAVA_HOME
+:: environment variables will be set, but only if Perl was found.
 
 :findJava
@@ -40 +40 @@
     echo.
 
-:: found java, JAVA_EXECUTABLE env var set, can exit this script
+    :: we know that works, so we can set the local javahome (for Greenstone) as well
+    "%SEARCH4J_EXECUTABLE%" -m "%MIN_VERSION%" -p "%HINT%" | winutil\setvar.exe GS_JAVA_HOME > %TMP%\set_java_home.bat
+    call "%TMP%\set_java_home.bat"
+    del "%TMP%\set_java_home.bat"
+
+:: found java, JAVA_EXECUTABLE and GS_JAVA_HOME env vars set, can exit this script
     goto exit
 
@@ -58 +63 @@
     :: Try to use this version
     set JAVA_EXECUTABLE=%JAVA_HOME%\bin\java
+    set GS_JAVA_HOME=%JAVA_HOME%
     goto exit
 

gli/trunk/findjava.sh

@@ -15 +15 @@
     # There is a JAVA_HOME already set, we're going to try using that
     javapath="$JAVA_HOME/bin/java"
-
+    javahome="$JAVA_HOME"
     # Print a warning that we're going to use whatever JAVA_HOME is set (fingers crossed)
     if [ "x$gslang" = "x" -o "$gslang" = "en" ]; then
@@ -75 +75 @@
     
     javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
+    javahome="`"$SEARCH4J_EXECUTABLE" -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
 
     if [ "$?" != "0" ]; then

gsdl/trunk/findjava.sh

@@ -68 +68 @@
     # Give search4j a hint to find Java depending on the platform
     if [ $GSDLOS = linux ]; then
-    HINT=`cd $GSDLHOME;pwd`/packages/jre
+    HINT=`cd "$GSDLHOME";pwd`/packages/jre
     elif [ $GSDLOS = darwin ]; then
     HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
@@ -132 +132 @@
     SEARCH4J_EXECUTABLE=search4j    
 elif [ -x "$GSDLHOME/bin/$GSDLOS/search4j" ]; then
-    SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j
+    SEARCH4J_EXECUTABLE="$GSDLHOME/bin/$GSDLOS/search4j"
 elif [ -x "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then
-    SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j
+    SEARCH4J_EXECUTABLE="$GSDL3SRCHOME/bin/search4j"
 elif [ -x "../bin/$GSDLOS/search4j" ]; then
     SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j

gsdl/trunk/gs2-server.bat

@@ -32 +32 @@
    pushd "%gsdl2path%"
    call setup.bat
-::   echo **** GSDLOS: %GSDLOS% and GSDLHOME: %GSDLHOME%
+rem   echo **** GSDLOS: %GSDLOS% and GSDLHOME: %GSDLHOME%
    popd
 )
@@ -116 +116 @@
 :: ---- Check Java ----
 :chkjava
-:: call the script with source, so that we have the variables it sets ($javapath)
+:: call the script with source, so that we have the variables JAVA_EXECUTABLE and GS_JAVA_HOME it sets
 set exit_status=0
 :: Need to find Java. If found, JAVA_EXECUTABLE will be set
@@ -122 +122 @@
 call "%GSDLHOME%\findjava.bat"
 if "%JAVA_EXECUTABLE%" == "" echo **** No Java executable found& goto exit
+set PATH=%GS_JAVA_HOME%\bin;%PATH%