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/jasper build.bat build.sh build.xml
Date Tue, 19 Sep 2000 19:45:52 GMT
pierred     00/09/19 12:45:51

  Modified:    jasper   build.bat build.sh build.xml
  Log:
  Now uses XERCES_HOME instead of JAXP_HOME
  
  Revision  Changes    Path
  1.2       +6 -6      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.bat	2000/08/12 00:52:04	1.1
  +++ build.bat	2000/09/19 19:45:50	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 [REQUIRED]
  +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
  -rem $Id: build.bat,v 1.1 2000/08/12 00:52:04 pierred Exp $
  +rem $Id: build.bat,v 1.2 2000/09/19 19:45:50 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
  @@ -34,10 +34,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 "%ANT_HOME%" == "" goto gotAntHome
   set ANT_HOME=../../jakarta-ant
  @@ -56,7 +56,7 @@
   
   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 ---------------------------------------
  
  
  
  1.2       +5 -7      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.sh	2000/08/12 00:52:04	1.1
  +++ build.sh	2000/09/19 19:45:50	1.2
  @@ -9,14 +9,12 @@
   #   ANT_OPTS         Command line options to the Java runtime
   #                    that executes Ant [NONE]
   #
  -#   JAVA_HOME        Must point at your Java Development Kit [REQUIRED]
  +#   XERCES_HOME      Must point at your XERCES installation [REQUIRED]
   #
  -#   JAXP_HOME        Must point at your JAXP installation [REQUIRED]
  -#
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   #                    [../../jakarta-servletapi]
   #
  -# $Id: build.sh,v 1.1 2000/08/12 00:52:04 pierred Exp $
  +# $Id: build.sh,v 1.2 2000/09/19 19:45:50 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -35,8 +33,8 @@
     exit 1
   fi
   
  -if [ "$JAXP_HOME" = "" ] ; then
  -  echo You must set JAXP_HOME to point at your Java API for XML Parsing install
  +if [ "$XERCES_HOME" = "" ] ; then
  +  echo You must set XERCES_HOME to point at your Xerces install
     exit 1
   fi
   
  @@ -55,5 +53,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 "$@"
   
  
  
  
  1.7       +5 -7      jakarta-tomcat-4.0/jasper/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2000/09/17 00:02:16	1.6
  +++ build.xml	2000/09/19 19:45:51	1.7
  @@ -7,13 +7,12 @@
     <property name="jasper.build"    value="../../build/jasper"/>
     <property name="jasper.deploy"   value="../../build/tomcat-4.0"/>
     <property name="jasper.dist"     value="../../dist/jasper"/>
  -  <property name="jaxp.home"       value="../../jaxp"/>
  +  <property name="xerces.home"     value="${basedir}/../xerces"/>
     <property name="servletapi.home" value="../../jakarta-servletapi"/>
   
   
     <!-- ================== Derived Property Values ========================= -->
  -  <property name="jaxp.jar"        value="${jaxp.home}/jaxp.jar"/>
  -  <property name="parser.jar"      value="${jaxp.home}/parser.jar"/>
  +  <property name="xerces.jar"      value="${xerces.home}/xerces.jar"/>
     <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
   
   
  @@ -37,11 +36,10 @@
       <chmod perm="+x" file="${jasper.build}/bin/jspc.sh"/>
   
       <!-- Shared Extensions -->
  -    <!--   Japser needs the servlet API classes -->
  +    <!--   Jasper needs the servlet API classes -->
       <copyfile src="${servlet.jar}" dest="${jasper.build}/lib/servlet.jar"/>
  -    <!--   Jasper needs a JAXP-compatible XML parser -->
  -    <copyfile src="${jaxp.jar}"    dest="${jasper.build}/lib/jaxp.jar"/>
  -    <copyfile src="${parser.jar}"  dest="${jasper.build}/lib/zparser.jar"/>
  +    <!--   Jasper needs Xerces (JAXP1.0/SAX2.0 compliant parser -->
  +    <copyfile src="${xerces.jar}"    dest="${jasper.build}/lib/xerces.jar"/>
   
     </target>
   
  
  
  

Mime
View raw message