You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@locus.apache.org on 2000/09/19 21:45:14 UTC
cvs commit: jakarta-tomcat-4.0/catalina build.bat build.sh
pierred 00/09/19 12:45:14
Modified: catalina build.bat build.sh
Log:
Now uses XERCES_HOME instead of JAXP_HOME
Revision Changes Path
1.5 +6 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.bat 2000/08/26 01:18:10 1.4
+++ build.bat 2000/09/19 19:45:13 1.5
@@ -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.4 2000/08/26 01:18:10 craigmcc Exp $
+rem $Id: build.bat,v 1.5 2000/09/19 19:45:13 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_HOME%\bin\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% -Djdom.home="%JDOM_HOME%" %1 %2 %3 %4 %5 %6 %7 %8 %9
rem ----- Restore Environment Variables ---------------------------------------
1.4 +5 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.sh 2000/08/26 01:18:11 1.3
+++ build.sh 2000/09/19 19:45:13 1.4
@@ -11,7 +11,7 @@
#
# JAVA_HOME Must point at your Java Development Kit [REQUIRED]
#
-# JAXP_HOME Must point at your JAXP installation [REQUIRED]
+# XERCES_HOME Must point at your XERCES installation [REQUIRED]
#
# JSSE_HOME Must point at your JSSE installation [REQUIRED]
#
@@ -21,7 +21,7 @@
# SERVLETAPI_HOME Must point at your "jakarta-servletapi" installation.
# [../../jakarta-servletapi]
#
-# $Id: build.sh,v 1.3 2000/08/26 01:18:11 craigmcc Exp $
+# $Id: build.sh,v 1.4 2000/09/19 19:45:13 pierred Exp $
# -----------------------------------------------------------------------------
@@ -40,8 +40,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
@@ -69,5 +69,5 @@
# ----- Execute The Requested Build -------------------------------------------
-java $ANT_OPTS -classpath $CP 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 "$@"
+java $ANT_OPTS -classpath $CP 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 "$@"