Return-Path: <craigmcc@locus.apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 36820 invoked by uid 500); 25 Apr 2000 16:56:25 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 36817 invoked by uid 1059); 25 Apr 2000 16:56:25 -0000
Date: 25 Apr 2000 16:56:25 -0000
Message-ID: <20000425165625.36816.qmail@locus.apache.org>
From: craigmcc@locus.apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat build.sh build.bat

craigmcc    00/04/25 09:56:24

  Modified:    .        build.sh build.bat
  Log:
  Support the ANT_OPTS environment variable (similar to the support found in
  the "bin/tomcat.bat" and "bin/tomcat.sh" scripts in the binary
  distribution) to allow JVM options -- such as maximum heap size setting --
  to be customized without modifying the basic scripts.
  
  PR: 202
  
  Revision  Changes    Path
  1.10      +8 -2      jakarta-tomcat/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.sh	2000/03/20 23:47:12	1.9
  +++ build.sh	2000/04/25 16:56:24	1.10
  @@ -1,6 +1,6 @@
   #! /bin/sh
   
  -# $Id: build.sh,v 1.9 2000/03/20 23:47:12 jhunter Exp $
  +# $Id: build.sh,v 1.10 2000/04/25 16:56:24 craigmcc Exp $
   
   if [ -z "$JAVA_HOME" ]
   then
  @@ -14,8 +14,14 @@
   JAVA_HOME=$JAVA_BINDIR/..
   fi
   
  -JAVACMD=$JAVA_HOME/bin/java
  +if [ "$ANT_OPTS" = "" ] ; then
  +  ANT_OPTS=""
  +fi
  +
  +JAVACMD=$JAVA_HOME/bin/java $ANT_OPTS
   
   cp=../jakarta-ant/lib/ant.jar:../jakarta-tools/moo.jar:../jakarta-ant/lib/xml.jar:../build/tomcat/classes:$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/dev.jar
   
   $JAVACMD -classpath $cp:$CLASSPATH org.apache.tools.ant.Main "$@"
  +
  +
  
  
  
  1.5       +29 -29    jakarta-tomcat/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.bat,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.bat	2000/01/15 17:35:10	1.4
  +++ build.bat	2000/04/25 16:56:24	1.5
  @@ -1,29 +1,29 @@
  -@echo off
  -REM convience bat file to build with
  -
  -SET _ANTHOME=%ANT_HOME%
  -if "%ANT_HOME%" == "" SET ANT_HOME=..\jakarta-ant
  -
  -if "%CLASSPATH%" == "" goto noclasspath
  -
  -rem else
  -set _CLASSPATH=%CLASSPATH%
  -set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\moo.jar
  -goto next
  -
  -:noclasspath
  -set _CLASSPATH=
  -set CLASSPATH=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\moo.jar
  -goto next
  -
  -:next
  -
  -java org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
  -
  -:clean
  -
  -rem clean up classpath after
  -set CLASSPATH=%_CLASSPATH%
  -set _CLASSPATH=
  -SET ANT_HOME=%_ANTHOME%
  -SET _ANTHOME=
  +@echo off
  +REM convience bat file to build with
  +
  +SET _ANTHOME=%ANT_HOME%
  +if "%ANT_HOME%" == "" SET ANT_HOME=..\jakarta-ant
  +
  +if "%CLASSPATH%" == "" goto noclasspath
  +
  +rem else
  +set _CLASSPATH=%CLASSPATH%
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\moo.jar
  +goto next
  +
  +:noclasspath
  +set _CLASSPATH=
  +set CLASSPATH=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\moo.jar
  +goto next
  +
  +:next
  +
  +java %ANT_OPTS% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
  +
  +:clean
  +
  +rem clean up classpath after
  +set CLASSPATH=%_CLASSPATH%
  +set _CLASSPATH=
  +SET ANT_HOME=%_ANTHOME%
  +SET _ANTHOME=