tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pier...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps build.bat build.sh
Date Wed, 20 Sep 2000 19:55:11 GMT
pierred     00/09/20 12:55:10

  Modified:    .        README.txt build.bat build.sh build.xml
               catalina build.bat build.sh build.xml
               jasper   build.bat build.sh
               webapps  build.bat build.sh
  Log:
  Taking into account the comments of "Bob Jamison" to make
  our build procedure as straightforward as possible:
     - regexp library is in different location depending whether you
       use the source or the binary distribution
     - xerces.jar should be in the classpath set by the build procedure
       when running ant
  
  modifications:
     - REGEXP_HOME and SERVLETAPI_HOME *must* now be defined for the
       build to run
     - regexp library fetched from top level directory of REGEXP_HOME
       (not bin anymore)
     - xerces.jar added to classpath when executing ant (added at the
       end of classpath so as not to disturb user's own classpath)
     - cleaned up top level build.xml by removing all property settings
       (since these must be set in the subdirs (we support
        building directly in a subdir), no need to
        duplicate at the top level)
  
  For people already using the tomcat-4.0 build:
  *** Make sure REGEXP_HOME points to a directory where there is
      jakarta-regexp-1.1.jar
  *** Make sure SERVLETAPI_HOME points to a directory where there is
      lib/servlet.jar
  *** Make sure XERCES_HOME points to a directory where there is
      xerces.jar
  
  Submitted by:	Bob Jamison <rjamison@lincom-asg.com>
  
  Revision  Changes    Path
  1.3       +10 -7     jakarta-tomcat-4.0/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/README.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- README.txt	2000/09/19 19:50:28	1.2
  +++ README.txt	2000/09/20 19:54:58	1.3
  @@ -67,14 +67,17 @@
     subdirectory, which will be used when building Tomcat.
   
   * Download and install the Regular Expressions distribution (module
  -  "jakarta-regexp") into a directory named
  -  "$JAKARTA_HOME/jakarta-regexp".  If you have downloaded the source
  -  distribution, you will need to build the library by executing the
  -  following commands:
  +  "jakarta-regexp"). Assuming an install directory <install-dir>:
   
  -	cd $JAKARTA_HOME/jakarta-regexp/build
  -	./build-regexp.sh	<-- Unix
  -	build-regexp		<-- Windows
  +  Binary distribution
  +    Set the REGEXP_HOME env variable to point to <install-dir>
  +
  +  Source distribution
  +    Build the library by executing the following commands:
  +        cd <install-dir>/build
  +        ./build-regexp.sh       <-- Unix
  +        build-regexp            <-- Windows
  +    Set the REGEXP_HOME env variable to point to <install-dir>/bin
   
   * Download and install the Servletapi distribution that includes the
     Servlet 2.3 and JSP 1.2 API classes.  A link is available on the Jakarta
  
  
  
  1.5       +8 -13     jakarta-tomcat-4.0/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.bat,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.bat	2000/09/19 19:43:27	1.4
  +++ build.bat	2000/09/20 19:54:58	1.5
  @@ -15,13 +15,12 @@
   rem
   rem   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
   rem
  -rem   REGEXP_HOME      Must point at your Regexp installation
  -rem                    [../jakarta-regexp]
  +rem   REGEXP_HOME      Must point at your Regexp installation [REQUIRED]
   rem
   rem   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -rem                    [../jakarta-servletapi]
  +rem                    [REQUIRED]
   rem
  -rem $Id: build.bat,v 1.4 2000/09/19 19:43:27 pierred Exp $
  +rem $Id: build.bat,v 1.5 2000/09/20 19:54:58 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
  @@ -29,8 +28,6 @@
   
   set _ANT_HOME=%ANT_HOME%
   set _CLASSPATH=%CLASSPATH%
  -set _REGEXP_HOME=%REGEXP_HOME%
  -set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
   
   
   rem ----- Verify and Set Required Environment Variables -----------------------
  @@ -55,18 +52,20 @@
   :gotAntHome
   
   if not "%REGEXP_HOME%" == "" goto gotRegexpHome
  -set REGEXP_HOME=../jakarta-regexp
  +echo You must set REGEXP_HOME to point at your Regular Expressions distribution install
  +goto cleanup
   :gotRegexpHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  -set SERVLETAPI_HOME=../jakarta-servletapi
  +echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes the Servlet
2.3 and JSP 1.2 API classes.
  +goto cleanup
   :gotServletapiHome
   
   
   rem ----- Set Up The Runtime Classpath ----------------------------------------
   
   if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
  -set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%XERCES_HOME%\xerces.jar
   
   
   rem ----- Execute The Requested Build -----------------------------------------
  @@ -76,12 +75,8 @@
   
   rem ----- Restore Environment Variables ---------------------------------------
   :cleanup
  -set SERVLETAPI_HOME=%_SERVLETAPI_HOME%
  -set _SERVLETAPIHOME=
   set CLASSPATH=%_CLASSPATH%
   set _CLASSPATH=
  -set REGEXP_HOME=%_REGEXP_HOME%
  -set _REGEXP_HOME=
   set ANT_HOME=%_ANT_HOME%
   set _ANT_HOME=
   :finish
  
  
  
  1.4       +7 -4      jakarta-tomcat-4.0/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.sh	2000/09/19 19:47:03	1.3
  +++ build.sh	2000/09/20 19:54:58	1.4
  @@ -21,7 +21,7 @@
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   #                    [../jakarta-servletapi]
   #
  -# $Id: build.sh,v 1.3 2000/09/19 19:47:03 pierred Exp $
  +# $Id: build.sh,v 1.4 2000/09/20 19:54:58 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -51,17 +51,20 @@
   fi
   
   if [ "$REGEXP_HOME" = "" ] ; then
  -  REGEXP_HOME=../jakarta-regexp
  +  echo You must set REGEXP_HOME to point at your Regular Expressions distribution install
  +  exit 1
   fi
   
   if [ "$SERVLETAPI_HOME" = "" ] ; then
  -  SERVLETAPI_HOME=../jakarta-servletapi
  +  echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes the
Servlet 2.3 and JSP 1.2 API classes.
  +  exit 1
   fi
   
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
  +
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$XERCES_HOME\xerces.jar
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$JAXP_HOME/jaxp.jar:$JAXP_HOME/parser.jar
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
  
  
  
  1.7       +0 -33     jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2000/09/19 19:43:27	1.6
  +++ build.xml	2000/09/20 19:54:59	1.7
  @@ -1,39 +1,6 @@
   <project name="Tomcat 4.0" default="deploy-main" basedir=".">
   
   
  -  <!-- ===================== Initialize Property Values =================== -->
  -  <property name="ant.home"        value="${basedir}/../jakarta-ant"/>
  -  <property name="build.compiler"  value="classic"/>
  -  <property name="catalina.build"  value="${basedir}/../build/catalina"/>
  -  <property name="catalina.deploy" value="${basedir}/../build/tomcat-4.0"/>
  -  <property name="catalina.dist"   value="${basedir}/../dist/catalina"/>
  -  <property name="jasper.build"    value="${basedir}/../build/jasper"/>
  -  <property name="jasper.deploy"   value="${basedir}/../build/tomcat-4.0"/>
  -  <property name="jasper.dist"     value="${basedir}/../dist/jasper"/>
  -  <property name="xerces.home"     value="${basedir}/../xerces"/>
  -  <property name="jsse.home"       value="${basedir}/../jsse"/>
  -  <property name="regexp.home"     value="${basedir}/../jakarta-regexp"/>
  -  <property name="servletapi.dist" value="${basedir}/../dist/servletapi"/>
  -  <property name="servletapi.home" value="${basedir}/../jakarta-servletapi"/>
  -  <property name="tomcat.build"    value="${basedir}/../build/tomcat-4.0"/>
  -  <property name="tomcat.dist"     value="${basedir}/../dist/tomcat-4.0"/>
  -  <property name="webapps.build"   value="${basedir}/../build/webapps"/>
  -  <property name="webapps.deploy"  value="${basedir}/../build/tomcat-4.0"/>
  -  <property name="webapps.dist"    value="${basedir}/../dist/webapps"/>
  -
  -
  -  <!-- ================== Derived Property Values ========================= -->
  -  <property name="xerces.jar"      value="${xerces.home}/xerces.jar"/>
  -  <property name="jnet.jar"        value="${jsse.home}/lib/jnet.jar"/>
  -  <property name="jsse.jar"        value="${jsse.home}/lib/jsse.jar"/>
  -  <property name="regexp.jar"      value="${regexp.home}/bin/jakarta-regexp-1.1.jar"/>
  -  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
  -
  -
  -  <target name="testit">
  -    <echo message="Base Directory is ${basedir}"/>
  -  </target>
  -
     <!-- ===================== DEPLOY: Create Directories =================== -->
     <target name="deploy-prepare">
       <mkdir dir="${tomcat.build}"/>
  
  
  
  1.7       +8 -13     jakarta-tomcat-4.0/catalina/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.bat,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.bat	2000/09/19 19:49:36	1.6
  +++ build.bat	2000/09/20 19:55:01	1.7
  @@ -15,13 +15,12 @@
   rem
   rem   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
   rem
  -rem   REGEXP_HOME      Must point at your Regexp installation
  -rem                    [../../jakarta-regexp]
  +rem   REGEXP_HOME      Must point at your Regexp installation [REQUIRED]
   rem
   rem   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -rem                    [../../jakarta-servletapi]
  +rem                    [REQUIRED]
   rem
  -rem $Id: build.bat,v 1.6 2000/09/19 19:49:36 pierred Exp $
  +rem $Id: build.bat,v 1.7 2000/09/20 19:55:01 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
  @@ -29,8 +28,6 @@
   
   set _ANT_HOME=%ANT_HOME%
   set _CLASSPATH=%CLASSPATH%
  -set _REGEXP_HOME=%REGEXP_HOME%
  -set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
   
   
   rem ----- Verify and Set Required Environment Variables -----------------------
  @@ -55,18 +52,20 @@
   :gotAntHome
   
   if not "%REGEXP_HOME%" == "" goto gotRegexpHome
  -set REGEXP_HOME=../../jakarta-regexp
  +echo You must set REGEXP_HOME to point at your Regular Expressions distribution install
  +goto cleanup
   :gotRegexpHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  -set SERVLETAPI_HOME=../../jakarta-servletapi
  +echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes the Servlet
2.3 and JSP 1.2 API classes.
  +goto cleanup
   :gotServletapiHome
   
   
   rem ----- Set Up The Runtime Classpath ----------------------------------------
   
   if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
  -set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%XERCES_HOME%\xerces.jar
   
   
   rem ----- Execute The Requested Build -----------------------------------------
  @@ -77,10 +76,6 @@
   rem ----- Restore Environment Variables ---------------------------------------
   
   :cleanup
  -set SERVLETAPI_HOME=%_SERVLETAPIHOME%
  -set _SERVLETAPIHOME=
  -set REGEXP_HOME=%_REGEXP_HOME%
  -set _REGEXP_HOME=
   set CLASSPATH=%_CLASSPATH%
   set _CLASSPATH=
   set ANT_HOME=%_ANT_HOME%
  
  
  
  1.5       +6 -4      jakarta-tomcat-4.0/catalina/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.sh	2000/09/19 19:45:13	1.4
  +++ build.sh	2000/09/20 19:55:02	1.5
  @@ -21,7 +21,7 @@
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   #                    [../../jakarta-servletapi]
   #
  -# $Id: build.sh,v 1.4 2000/09/19 19:45:13 pierred Exp $
  +# $Id: build.sh,v 1.5 2000/09/20 19:55:02 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -51,17 +51,19 @@
   fi
   
   if [ "$REGEXP_HOME" = "" ] ; then
  -  REGEXP_HOME=../../jakarta-regexp
  +  echo You must set REGEXP_HOME to point at your Regular Expressions distribution install
  +  exit 1
   fi
   
   if [ "$SERVLETAPI_HOME" = "" ] ; then
  -  SERVLETAPI_HOME=../../jakarta-servletapi
  +  echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes the
Servlet 2.3 and JSP 1.2 API classes.
  +  exit 1
   fi
   
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$XERCES_HOME\xerces.jar
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
  
  
  
  1.13      +2 -1      jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	2000/09/20 16:30:26	1.12
  +++ build.xml	2000/09/20 19:55:03	1.13
  @@ -18,11 +18,12 @@
     <property name="jcert.jar"       value="${jsse.home}/lib/jcert.jar"/>
     <property name="jnet.jar"        value="${jsse.home}/lib/jnet.jar"/>
     <property name="jsse.jar"        value="${jsse.home}/lib/jsse.jar"/>
  -  <property name="regexp.jar"      value="${regexp.home}/bin/jakarta-regexp-1.1.jar"/>
  +  <property name="regexp.jar"      value="${regexp.home}/jakarta-regexp-1.1.jar"/>
     <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
   
     <!-- =================== BUILD: Create Directories ====================== -->
     <target name="build-prepare">
  +  <echo message="regexp.jar = ${regexp.jar}"/>
       <mkdir dir="${catalina.build}"/>
       <mkdir dir="${catalina.build}/bin"/>
       <mkdir dir="${catalina.build}/classes"/>
  
  
  
  1.3       +5 -7      jakarta-tomcat-4.0/jasper/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.bat	2000/09/19 19:45:50	1.2
  +++ build.bat	2000/09/20 19:55:06	1.3
  @@ -14,9 +14,9 @@
   rem   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
   rem
   rem   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -rem                    [../../jakarta-servletapi]
  +rem                    [REQUIRED]
   rem
  -rem $Id: build.bat,v 1.2 2000/09/19 19:45:50 pierred Exp $
  +rem $Id: build.bat,v 1.3 2000/09/20 19:55:06 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
  @@ -24,7 +24,6 @@
   
   set _ANT_HOME=%ANT_HOME%
   set _CLASSPATH=%CLASSPATH%
  -set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
   
   
   rem ----- Verify and Set Required Environment Variables -----------------------
  @@ -44,14 +43,15 @@
   :gotAntHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  -set SERVLETAPI_HOME=../../jakarta-servletapi
  +echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes the Servlet
2.3 and JSP 1.2 API classes.
  +goto cleanup
   :gotServletapiHome
   
   
   rem ----- Set Up The Runtime Classpath ----------------------------------------
   
   if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
  -set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%XERCES_HOME%\xerces.jar
   
   
   rem ----- Execute The Requested Build -----------------------------------------
  @@ -62,8 +62,6 @@
   rem ----- Restore Environment Variables ---------------------------------------
   
   :cleanup
  -set SERVLETAPI_HOME=%_SERVLETAPIHOME%
  -set _SERVLETAPIHOME=
   set CLASSPATH=%_CLASSPATH%
   set _CLASSPATH=
   set ANT_HOME=%_ANT_HOME%
  
  
  
  1.3       +4 -3      jakarta-tomcat-4.0/jasper/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.sh	2000/09/19 19:45:50	1.2
  +++ build.sh	2000/09/20 19:55:07	1.3
  @@ -14,7 +14,7 @@
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   #                    [../../jakarta-servletapi]
   #
  -# $Id: build.sh,v 1.2 2000/09/19 19:45:50 pierred Exp $
  +# $Id: build.sh,v 1.3 2000/09/20 19:55:07 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -39,13 +39,14 @@
   fi
   
   if [ "$SERVLETAPI_HOME" = "" ] ; then
  -  SERVLETAPI_HOME=../../jakarta-servletapi
  +  echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes the
Servlet 2.3 and JSP 1.2 API classes.
  +  exit 1
   fi
   
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$XERCES_HOME\xerces.jar
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
  
  
  
  1.2       +7 -9      jakarta-tomcat-4.0/webapps/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.bat	2000/08/21 18:30:25	1.1
  +++ build.bat	2000/09/20 19:55:09	1.2
  @@ -11,12 +11,12 @@
   rem
   rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   rem
  -rem   JAXP_HOME        Must point at your JAXP installation 
  +rem   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
   rem
   rem   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -rem                    [../../jakarta-servletapi]
  +rem                    [REQUIRED]
   rem
  -rem $Id: build.bat,v 1.1 2000/08/21 18:30:25 horwat Exp $
  +rem $Id: build.bat,v 1.2 2000/09/20 19:55:09 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
  @@ -24,7 +24,6 @@
   
   set _ANT_HOME=%ANT_HOME%
   set _CLASSPATH=%CLASSPATH%
  -set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
   
   
   rem ----- Verify and Set Required Environment Variables -----------------------
  @@ -39,26 +38,25 @@
   :gotAntHome
   
   if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
  -set SERVLETAPI_HOME=../../jakarta-servletapi
  +echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes the Servlet
2.3 and JSP 1.2 API classes.
  +goto cleanup
   :gotServletapiHome
   
   
   rem ----- Set Up The Runtime Classpath ----------------------------------------
   
   if not "%CLASSPATH%" == "" set CLASSPATH=%CLASSPATH%;
  -set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar
  +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%JAVA_HOME%\lib\tools.jar;%XERCES_HOME%\xerces.jar
   
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Djaxp.home="%JAXP_HOME%"
-Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
  +java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dxerces.home="%XERCES_HOME%"
-Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
   
   :cleanup
  -set SERVLETAPI_HOME=%_SERVLETAPIHOME%
  -set _SERVLETAPIHOME=
   set CLASSPATH=%_CLASSPATH%
   set _CLASSPATH=
   set ANT_HOME=%_ANT_HOME%
  
  
  
  1.2       +7 -6      jakarta-tomcat-4.0/webapps/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.sh	2000/08/21 18:30:25	1.1
  +++ build.sh	2000/09/20 19:55:09	1.2
  @@ -11,12 +11,12 @@
   #
   #   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   #
  -#   JAXP_HOME        Must point at your JAXP installation
  +#   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
   #
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
  -#                    [../../jakarta-servletapi]
  +#                    [REQUIRED]
   #
  -# $Id: build.sh,v 1.1 2000/08/21 18:30:25 horwat Exp $
  +# $Id: build.sh,v 1.2 2000/09/20 19:55:09 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -36,13 +36,14 @@
   fi
   
   if [ "$SERVLETAPI_HOME" = "" ] ; then
  -  SERVLETAPI_HOME=../../jakarta-servletapi
  +  echo You must set SERVLETAPI_HOME to your Servlet API distribution that includes the
Servlet 2.3 and JSP 1.2 API classes.
  +  exit 1
   fi
   
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar
  +CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar:$XERCES_HOME\xerces.jar
   if [ "$CLASSPATH" != "" ] ; then
     CP=$CLASSPATH:$CP
   fi
  @@ -50,5 +51,5 @@
   
   # ----- Execute The Requested Build -------------------------------------------
   
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Djaxp.home=$JAXP_HOME
-Dservletapi.home=$SERVLETAPI_HOME "$@"
  +java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dxerces.home=$XERCES_HOME
-Dservletapi.home=$SERVLETAPI_HOME "$@"
   
  
  
  

Mime
View raw message