You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/06/12 01:03:02 UTC
cvs commit: jakarta-tomcat/proposals/catalina build.bat build.sh build.xml
craigmcc 00/06/11 16:03:02
Modified: proposals/catalina build.bat build.sh build.xml
Log:
Include "jaxp.jar" and "parser.jar" from the developer's JAXP installation
in the distribution version of Catalina so that end users do not have to
download and install it.
As a side effect, Catalina developers must now define an environment
variable JAXP_HOME that points at their JAXP distribution.
Revision Changes Path
1.3 +1 -1 jakarta-tomcat/proposals/catalina/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/build.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.bat 2000/04/27 05:55:12 1.2
+++ build.bat 2000/06/11 23:03:00 1.3
@@ -21,7 +21,7 @@
:next
-java org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+java org.apache.tools.ant.Main -Djaxp.home=%JAXP_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
:clean
1.4 +2 -2 jakarta-tomcat/proposals/catalina/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.sh 2000/04/27 05:55:12 1.3
+++ build.sh 2000/06/11 23:03:01 1.4
@@ -1,6 +1,6 @@
#! /bin/sh
-# $Id: build.sh,v 1.3 2000/04/27 05:55:12 craigmcc Exp $
+# $Id: build.sh,v 1.4 2000/06/11 23:03:01 craigmcc Exp $
if [ -z "$JAVA_HOME" ]
then
@@ -18,6 +18,6 @@
cp=../../../jakarta-ant/lib/ant.jar::../../../jakarta-servletapi/lib/servlet.jar:../../../build/catalina/classes:../../../build/tomcat/classes:$JAVA_HOME/lib/tools.jar
-$JAVACMD -classpath $cp:$CLASSPATH org.apache.tools.ant.Main "$@"
+$JAVACMD -classpath $cp:$CLASSPATH org.apache.tools.ant.Main -Djaxp.home=$JAXP_HOME "$@"
chmod +x `find ../../../build -name "*.sh"`
1.19 +6 -0 jakarta-tomcat/proposals/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 2000/06/11 01:56:32 1.18
+++ build.xml 2000/06/11 23:03:01 1.19
@@ -5,6 +5,7 @@
<property name="build.compiler" value="classic"/>
<property name="catalina.build" value="../../../build/catalina"/>
<property name="catalina.dist" value="../../../dist/catalina"/>
+ <property name="jaxp.home" value="../../../jaxp"/>
<property name="regexp.jar" value="../../../jakarta-regexp/bin/jakarta-regexp-1.1.jar"/>
<property name="servlet.jar" value="../../../jakarta-servletapi/lib/servlet.jar"/>
<property name="tomcat.build" value="../../../build/tomcat"/>
@@ -27,6 +28,11 @@
<target name="static" depends="prepare">
<copyfile src="${ant.home}/lib/ant.jar"
dest="${catalina.build}/lib/ant.jar"/>
+ <echo message="JAXP home is ${jaxp.home}"/>
+ <copyfile src="${jaxp.home}/jaxp.jar"
+ dest="${catalina.build}/lib/jaxp.jar"/>
+ <copyfile src="${jaxp.home}/parser.jar"
+ dest="${catalina.build}/lib/parser.jar"/>
<copyfile src="${regexp.jar}" dest="${catalina.build}/lib/regexp.jar"/>
<copyfile src="${servlet.jar}" dest="${catalina.build}/lib/servlet.jar"/>
<copydir src="src/bin" dest="${catalina.build}/bin"/>