[pkg-java] r2754 - in branches/tomcat5.5/feature/debian: build debian

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-15 11:44:56 +0100 (Wed, 15 Nov 2006)
New Revision: 2754

Modified:
   branches/tomcat5.5/feature/debian/build/build.xml
   branches/tomcat5.5/feature/debian/debian/rules
Log:
Don't use precompiled class files. Rebuild jkstatus-ant into a separate directory, so as not to overwrite bundled binaries. Don't delete the bundled jar file, this makes build-clean cycle non-idempotent.


Modified: branches/tomcat5.5/feature/debian/build/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/build/build.xml	2006-11-15 10:21:17 UTC (rev 2753)
+++ branches/tomcat5.5/feature/debian/build/build.xml	2006-11-15 10:44:56 UTC (rev 2754)
@@ -274,6 +274,8 @@
     <ant dir="${jtc.home}/jk/jkstatus" target="dist">
       <property name="catalina.build" value="${tomcat.build}"/>
       <property name="jtc.home" value="${jtc.home}"/>
+      <property name="jk.build" value="${tomcat.build}/tmp/tomcat-jkstatus-ant/build"/>
+      <property name="jk.dist" value="${tomcat.build}/tmp/tomcat-jkstatus-ant/dist"/>
     </ant>
 
   	<!-- jkstatus ant API -->
@@ -281,6 +283,7 @@
     <ant dir="${jtc.home}/jk/jkstatus" target="copy">
       <property name="catalina.build" value="${tomcat.build}"/>
       <property name="jtc.home" value="${jtc.home}"/>
+      <property name="jk.dist" value="${tomcat.build}/tmp/tomcat-jkstatus-ant/dist"/>
     </ant>
 
   </target>

Modified: branches/tomcat5.5/feature/debian/debian/rules
===================================================================
--- branches/tomcat5.5/feature/debian/debian/rules	2006-11-15 10:21:17 UTC (rev 2753)
+++ branches/tomcat5.5/feature/debian/debian/rules	2006-11-15 10:44:56 UTC (rev 2754)
@@ -30,5 +30,4 @@
 	-rm -r build/compat
 	-rm -r build/deployer
 	-rm -r build/tmp
-	-rm connectors/jk/jkstatus/dist/tomcat-jkstatus-ant.jar
 	-rm -f LICENSE