You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@apache.org on 2001/08/30 13:44:32 UTC
cvs commit: jakarta-tomcat/src/shell startup.bat shutdown.bat jspc.bat
larryi 01/08/30 04:44:32
Modified: src/shell startup.bat shutdown.bat jspc.bat
Log:
Modify to not set TOMCAT_HOME so tomcat.bat can always guess if
TOMCAT_HOME hasn't been set by the user.
Revision Changes Path
1.10 +13 -9 jakarta-tomcat/src/shell/startup.bat
Index: startup.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/startup.bat,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- startup.bat 2000/11/03 12:15:37 1.9
+++ startup.bat 2001/08/30 11:44:32 1.10
@@ -1,23 +1,27 @@
@echo off
-rem $Id: startup.bat,v 1.9 2000/11/03 12:15:37 nacho Exp $
+rem $Id: startup.bat,v 1.10 2001/08/30 11:44:32 larryi Exp $
rem Startup batch file for tomcat server.
rem This batch file written and tested under Windows NT
rem Improvements to this file are welcome
-if not "%TOMCAT_HOME%" == "" goto start
+set _TC_BIN_DIR=%TOMCAT_HOME%\bin
+if not "%_TC_BIN_DIR%" == "\bin" goto start
-SET TOMCAT_HOME=.
-if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
+set _TC_BIN_DIR=.\bin
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
-SET TOMCAT_HOME=..
-if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
+set _TC_BIN_DIR=.
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
-SET TOMCAT_HOME=
-echo Unable to determine the value of TOMCAT_HOME.
+set _TC_BIN_DIR=..\bin
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
+
+echo Unable to determine the location of Tomcat.
goto eof
:start
-call "%TOMCAT_HOME%\bin\tomcat" start %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%_TC_BIN_DIR%\tomcat" start %1 %2 %3 %4 %5 %6 %7 %8 %9
:eof
+set _TC_BIN_DIR=
1.7 +13 -9 jakarta-tomcat/src/shell/shutdown.bat
Index: shutdown.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/shutdown.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- shutdown.bat 2000/09/04 21:24:49 1.6
+++ shutdown.bat 2001/08/30 11:44:32 1.7
@@ -1,20 +1,24 @@
@echo off
-rem $Id: shutdown.bat,v 1.6 2000/09/04 21:24:49 larryi Exp $
+rem $Id: shutdown.bat,v 1.7 2001/08/30 11:44:32 larryi Exp $
rem Startup batch file for tomcat server.
-if not "%TOMCAT_HOME%" == "" goto start
+set _TC_BIN_DIR=%TOMCAT_HOME%\bin
+if not "%_TC_BIN_DIR%" == "\bin" goto start
-SET TOMCAT_HOME=.
-if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
+set _TC_BIN_DIR=.\bin
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
-SET TOMCAT_HOME=..
-if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
+set _TC_BIN_DIR=.
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
-SET TOMCAT_HOME=
-echo Unable to determine the value of TOMCAT_HOME.
+set _TC_BIN_DIR=..\bin
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
+
+echo Unable to determine the location of Tomcat.
goto eof
:start
-call "%TOMCAT_HOME%\bin\tomcat" stop %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%_TC_BIN_DIR%\tomcat" stop %1 %2 %3 %4 %5 %6 %7 %8 %9
:eof
+set _TC_BIN_DIR=
1.6 +13 -9 jakarta-tomcat/src/shell/jspc.bat
Index: jspc.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/jspc.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jspc.bat 2000/09/04 21:24:49 1.5
+++ jspc.bat 2001/08/30 11:44:32 1.6
@@ -1,23 +1,27 @@
@echo off
-rem $Id: jspc.bat,v 1.5 2000/09/04 21:24:49 larryi Exp $
+rem $Id: jspc.bat,v 1.6 2001/08/30 11:44:32 larryi Exp $
rem A batch file to run the JspC Compiler
rem This batch file written and tested under Windows NT
rem Improvements to this file are welcome
-if not "%TOMCAT_HOME%" == "" goto start
+set _TC_BIN_DIR=%TOMCAT_HOME%\bin
+if not "%_TC_BIN_DIR%" == "\bin" goto start
-SET TOMCAT_HOME=.
-if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
+set _TC_BIN_DIR=.\bin
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
-SET TOMCAT_HOME=..
-if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
+set _TC_BIN_DIR=.
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
-SET TOMCAT_HOME=
-echo Unable to determine the value of TOMCAT_HOME.
+set _TC_BIN_DIR=..\bin
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
+
+echo Unable to determine the location of Tomcat.
goto eof
:start
-call "%TOMCAT_HOME%\bin\tomcat" jspc %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%_TC_BIN_DIR%\tomcat" jspc %1 %2 %3 %4 %5 %6 %7 %8 %9
:eof
+set _TC_BIN_DIR=