You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pa...@apache.org on 2002/02/05 18:59:28 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/bin setclasspath.bat

patrickl    02/02/05 09:59:28

  Modified:    catalina/src/bin setclasspath.bat
  Log:
  Add checking for all of the other tools in JAVA_HOME that the other scripts use
  
  Revision  Changes    Path
  1.3       +10 -2     jakarta-tomcat-4.0/catalina/src/bin/setclasspath.bat
  
  Index: setclasspath.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/setclasspath.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- setclasspath.bat	30 Jan 2002 23:01:50 -0000	1.2
  +++ setclasspath.bat	5 Feb 2002 17:59:28 -0000	1.3
  @@ -1,7 +1,7 @@
   rem ---------------------------------------------------------------------------
   rem Set CLASSPATH and Java options
   rem
  -rem $Id: setclasspath.bat,v 1.2 2002/01/30 23:01:50 patrickl Exp $
  +rem $Id: setclasspath.bat,v 1.3 2002/02/05 17:59:28 patrickl Exp $
   rem ---------------------------------------------------------------------------
   
   rem Make sure prerequisite environment variables are set
  @@ -10,7 +10,12 @@
   echo This environment variable is needed to run this program
   goto end
   :gotJavaHome
  -if exist "%JAVA_HOME%\bin\java.exe" goto okJavaHome
  +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
  +goto okJavaHome
  +:noJavaHome
   echo The JAVA_HOME environment variable is not defined correctly
   echo This environment variable is needed to run this program
   goto end
  @@ -44,3 +49,6 @@
   set _RUNJAVA="%JAVA_HOME%\bin\java"
   set _RUNJAVAW="%JAVA_HOME%\bin\javaw"
   set _RUNJDB="%JAVA_HOME%\bin\jdb"
  +set _RUNJAVAC="%JAVA_HOME%\bin\javac"
  +
  +:end
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>