Return-Path: <pierred@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 40317 invoked by uid 500); 19 Sep 2000 19:43:28 -0000
Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org
Received: (qmail 40310 invoked by uid 1003); 19 Sep 2000 19:43:28 -0000
Date: 19 Sep 2000 19:43:28 -0000
Message-ID: <20000919194328.40309.qmail@locus.apache.org>
From: pierred@locus.apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-4.0 build.bat build.xml

pierred     00/09/19 12:43:28

  Modified:    .        build.bat build.xml
  Log:
  Now uses XERCES_HOME instead of JAXP_HOME
  
  Revision  Changes    Path
  1.4       +6 -6      jakarta-tomcat-4.0/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.bat	2000/09/03 13:49:25	1.3
  +++ build.bat	2000/09/19 19:43:27	1.4
  @@ -11,7 +11,7 @@
   rem
   rem   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
   rem
  -rem   JAXP_HOME        Must point at your JAXP installation [REQUIRED]
  +rem   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
   rem
   rem   JSSE_HOME        Must point at your JSSE installation [REQUIRED]
   rem
  @@ -21,7 +21,7 @@
   rem   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   rem                    [../jakarta-servletapi]
   rem
  -rem $Id: build.bat,v 1.3 2000/09/03 13:49:25 pierred Exp $
  +rem $Id: build.bat,v 1.4 2000/09/19 19:43:27 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
  @@ -40,10 +40,10 @@
   goto cleanup
   :gotJavaHome
   
  -if not "%JAXP_HOME%" == "" goto gotJaxpHome
  -echo You must set JAXP_HOME to point at your Java API for XML Parsing install
  +if not "%XERCES_HOME%" == "" goto gotXercesHome
  +echo You must set XERCES_HOME to point at your Xerces install
   goto cleanup
  -:gotJaxpHome
  +:gotXercesHome
   
   if not "%JSSE_HOME%" == "" goto gotJsseHome
   echo You must set JSSE_HOME to point at your Java Security Extensions install
  @@ -71,7 +71,7 @@
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Djaxp.home="%JAXP_HOME%" -Djsse.home=%JSSE_HOME% -Dregexp.home=%REGEXP_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%" -Djsse.home=%JSSE_HOME% -Dregexp.home=%REGEXP_HOME% -Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
  
  
  
  1.6       +2 -3      jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	2000/08/31 19:09:02	1.5
  +++ build.xml	2000/09/19 19:43:27	1.6
  @@ -10,7 +10,7 @@
     <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="jaxp.home"       value="${basedir}/../jaxp"/>
  +  <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"/>
  @@ -23,10 +23,9 @@
   
   
     <!-- ================== Derived Property Values ========================= -->
  -  <property name="jaxp.jar"        value="${jaxp.home}/jaxp.jar"/>
  +  <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="parser.jar"      value="${jaxp.home}/parser.jar"/>
     <property name="regexp.jar"      value="${regexp.home}/bin/jakarta-regexp-1.1.jar"/>
     <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>