Changeset 20656

Timestamp:

2009-09-21T14:32:05+12:00 (15 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.

File:

• gsdl/trunk/findjava.bat (modified) (3 diffs)

gsdl/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