Changeset 20300 for greenstone3/trunk/gs3-setup.bat

Timestamp:

2009-08-17T11:23:40+12:00 (15 years ago)

Author:

oranfry

Message:

copied the logic from linux-eqiv file (or near enough) to get gs3-setup working in absence of search4j

File:

• greenstone3/trunk/gs3-setup.bat (modified) (1 diff)

greenstone3/trunk/gs3-setup.bat

@@ -48 +48 @@
 
 :: ---- Search for java ----
-bin\search4j.exe -p "%CD%\packages\jre" -m %java_min_version% | winutil\setvar.exe _JRE_HOME > %TMP%\set_jre_home.bat
-call %TMP%\set_jre_home.bat
-del %TMP%\set_jre_home.bat
+set JAVA_MIN_VERSION=1.5.0_00
+set HINT=%CD%\packages\jre
+::if search4j is present, use it
+set FOUNDJAVAHOME=
+set RUNJAVA=
+if exist bin\search4j.exe (
+  for /F "tokens=*" %%r in ('bin\search4j.exe -p "%HINT%" -m %JAVA_MIN_VERSION%') do set FOUNDJAVAHOME=%%r
+)
 
-echo %_JRE_HOME%\bin\java.exe | winutil\setvar.exe RUNJAVA > %TMP%\setrunjava.bat
-call %TMP%\setrunjava.bat
-del %TMP%\setrunjava.bat
+if not "%FOUNDJAVAHOME%"=="" (
+  set JAVA_HOME=%FOUNDJAVAHOME%
+  set PATH=%FOUNDJAVAHOME%\bin;%PATH%
+  set RUNJAVA=%FOUNDJAVAHOME%\bin\java.exe
+  goto summaryThenEnd
+)
 
-if "%JRE_HOME%" == "" set JRE_HOME=%_JRE_HOME%
+if exist "%HINT%\bin\java.exe" (
+  set JAVA_HOME=%HINT%
+  set PATH=%JAVA_HOME%\bin;%PATH%
+  set RUNJAVA=%JAVA_HOME%\bin\java.exe
+  goto summaryThenEnd
+)
+
+if exist "%JAVA_HOME%\bin\java.exe" (
+  set PATH=%JAVA_HOME%\bin;%PATH%
+  set RUNJAVA=%JAVA_HOME%\bin\java.exe
+  echo Using java at %JAVA_HOME%
+  echo WARNING: Greenstone has not checked the version number of this java installation
+  echo          The source distribution of Greenstone3 requires java 1.5 or greater
+  echo          SVN users may still use java 1.4
+  goto summaryThenEnd
+)
+
+if exist "%JRE_HOME%\bin\java.exe" (
+  set PATH=%JRE_HOME%\bin;%PATH%
+  set RUNJAVA=%JRE_HOME%\bin\java.exe
+  echo Using java at %JRE_HOME%
+  echo WARNING: Greenstone has not checked the version number of this java installation
+  echo          The source distribution of Greenstone3 requires java 1.5 or greater
+  echo          SVN users may still use java 1.4
+  goto summaryThenEnd
+)
+
+echo ERROR: Failed to locate java
+echo        Please set JAVA_HOME or JRE_HOME to point to an appropriate java
+goto end
+
+:summaryThenEnd
 
 echo GSDL3SRCHOME : %GSDL3SRCHOME%
 echo GSDL3HOME    : %GSDL3HOME%
 echo JAVA         : %RUNJAVA%
+
+:end