costin 2002/10/28 11:32:44 Modified: . build.xml Log: Few more fixes for the build target, a bit of regrouping. I think it works fine ( or good enough :-). Revision Changes Path 1.53 +52 -9 jakarta-tomcat-5/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- build.xml 28 Oct 2002 15:53:33 -0000 1.52 +++ build.xml 28 Oct 2002 19:32:44 -0000 1.53 @@ -24,6 +24,9 @@ <property name="jtc.project" value="jakarta-tomcat-connectors" /> <property name="jasper.project" value="jakarta-tomcat-jasper" /> + <property name="cvs.base" + value="${basedir}/.."/> + <!-- Source dependencies --> <property name="api.home" value="${basedir}/../${api.project}"/> @@ -97,6 +100,11 @@ <srcfiles dir="${jtc.home}/coyote/src" includes="**" /> </uptodate> + <uptodate property="tomcathttp11.build.notrequired" + targetfile="${tomcat.build}/server/lib/tomcat-http11.jar"> + <srcfiles dir="${jtc.home}/http11/src" includes="**" /> + </uptodate> + <uptodate property="admin.build.notrequired" targetfile="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml"> <srcfiles dir="${catalina.home}/webapps/admin" includes="**" /> @@ -147,6 +155,15 @@ <property name="tomcat5.home" value="${catalina.build}"/> <property name="commons-logging.jar" value="${commons-logging.jar}"/> <property name="jmx.jar" value="${jmx.jar}"/> + + <property name="jk.build" value="${tomcat.build}"/> + + <property name="tomcat-jk.jar" value="${tomcat.build}/server/lib/tomcat-jk.jar" /> + <property name="tomcat-jkconfig.jar" value="${tomcat.build}/server/lib/jkconfig.jar" /> + <property name="tomcat-jkshm.jar" value="${tomcat.build}/server/lib/jkshm.jar" /> + <property name="tomcat-jk2.jar" value="${tomcat.build}/server/lib/tomcat-jk2.jar" /> + <property name="tomcat-jni.jar" value="${tomcat.build}/server/lib/tomcat-jni.jar" /> + </ant> </target> @@ -158,14 +175,25 @@ <ant dir="${jtc.home}/coyote" target="compile.tomcat5"> <property name="catalina.home" value="${tomcat.build}"/> <property name="tomcat5.detect" value="true"/> - <property name="servlet.jar" value="${servlet-api.jar}"/> + <property name="servlet.jar" value="${tomcat.build}/common/lib/servlet-api.jar"/> </ant> </target> + <target name="build-tomcathttp11" + unless="tomcathttp11.build.notrequired" + depends="init"> + <echo>========== Building: tomcat-http11 </echo> + + <ant dir="${jtc.home}/http11" target="compile"> + <property name="build.home" value="${tomcat.build}"/> + <property name="tomcat-http11.jar" value="${tomcat.build}/server/lib/tomcat-http11.jar"/> + <property name="commons-logging.jar" value="${commons-logging.jar}"/> + </ant> + </target> <target name="build-admin" unless="admin.build.notrequired" depends="init" > - <echo>========== Building: admin ( ${admin.build.notrequired} ) </echo> + <echo>========== Building: admin </echo> <ant dir="${catalina.home}/webapps/admin" target="build-main"> <!-- property name="flags.hide" value="true" / --> <property name="webapps.build" value="${tomcat.build}/server/webapps"/> @@ -174,7 +202,6 @@ <touch file="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml" /> </target> - <target name="build" depends="init" description="Builds all components"> @@ -194,13 +221,9 @@ <antcall target="build-tomcatcoyote"/> <antcall target="build-tomcatjk"/> - - <echo>========== Building: tomcat-httpd </echo> - - <ant dir="${jtc.home}/http11" target="compile"> - <property name="commons-logging.jar" value="${commons-logging.jar}"/> - </ant> + <antcall target="build-tomcathttp11"/> + <echo>========== Building: jasper </echo> <ant dir="${jasper.home}" target="deploy"> @@ -211,10 +234,30 @@ <fixcrlf srcdir="${tomcat.build}/bin" includes="*.sh" eol="lf"/> <fixcrlf srcdir="${tomcat.build}/bin" includes="*.bat" eol="crlf"/> <chmod dir="${tomcat.build}/bin" includes="*.sh" perm="+x"/> + </target> + + <!-- ====================== Build dependent code =================== --> + + <target name="build-commons-logging" unless="commons-logging.build.notrequired" > + <echo>========== Building: commons-logging </echo> + + <ant dir="${cvs.base}/jakarta-commons/logging" target="compile-only" > + <property name="commons-logging-api.jar" location="${tomcat.build}/common/lib/commons-logging-api.jar" /> + <property name="commons-logging.jar" location="${tomcat.build}/server/lib/commons-logging.jar" /> + <property name="build.home" value="${tomcat.build}" /> + </ant> + </target> + + <target name="build-depends" depends="init" + description="Builds various dependent components"> + <antcall target="build-commons-logging" /> </target> + + <!-- ====================== DEPLOY: Deploy Components =================== --> + <target name="deploy" depends="deploy-static" description="Build and deploy all components">
-- To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org> For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>