Changeset 14725 for greenstone3/trunk/resources/tomcat/setclasspath.bat

Timestamp:

2007-10-23T17:07:09+13:00 (17 years ago)

Author:

qq6

Message:

looking for the JRE home first then the JAVA_home when running tomcat

File:

• greenstone3/trunk/resources/tomcat/setclasspath.bat (modified) (2 diffs)

greenstone3/trunk/resources/tomcat/setclasspath.bat

@@ -6 +6 @@
 
 rem Make sure prerequisite environment variables are set
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo The JAVA_HOME environment variable is not defined
-echo This environment variable is needed to run this program
+if not "%JAVA_HOME%" == "" goto gotJdkHome
+if not "%JRE_HOME%" == "" goto gotJreHome
+echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined
+echo At least one of these environment variable is needed to run this program
 goto exit
-:gotJavaHome
+
+:gotJreHome
+if not exist "%JRE_HOME%\bin\java.exe" goto noJavaHome
+if not exist "%JRE_HOME%\bin\javaw.exe" goto noJavaHome
+if not ""%1"" == ""debug"" goto okJavaHome
+echo JAVA_HOME should point to a JDK in order to run in debug mode.
+goto exit
+
+:gotJdkHome
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome
+if not "%JRE_HOME%" == "" goto okJavaHome
+set JRE_HOME=%JAVA_HOME%
 goto okJavaHome
+
 :noJavaHome
 echo The JAVA_HOME environment variable is not defined correctly
@@ -45 +57 @@
 rem Note that NT requires a window name argument when using start.
 rem Also note the quoting as JAVA_HOME may contain spaces.
-set _RUNJAVA="%JAVA_HOME%\bin\java"
-set _RUNJAVAW="%JAVA_HOME%\bin\javaw"
+set _RUNJAVA="%JRE_HOME%\bin\java"
+set _RUNJAVAW="%JRE_HOME%\bin\javaw"
 set _RUNJDB="%JAVA_HOME%\bin\jdb"
 set _RUNJAVAC="%JAVA_HOME%\bin\javac"