billbarker 2004/08/16 20:16:59
Modified: coyote build.xml
Log:
Splitting the adapter jars from the shared jar in the build.
This is so I can inch the Tomcat Gump builds a bit closer to sanity, and it won't
take so long to test changes to the project files.
Revision Changes Path
1.29 +21 -12 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build.xml 16 Mar 2004 19:48:38 -0000 1.28
+++ build.xml 17 Aug 2004 03:16:59 -0000 1.29
@@ -271,13 +271,9 @@
</copy>
</target>
- <target name="compile"
- depends="static,report,compile.shared,compile.tomcat4,compile.tomcat33"
- description="Compile Coyote and its Adapters">
+ <target name="shared.jar" depends="static,compile.shared"
+ description="Build shared Coyote jar">
<property name="tomcat-coyote.jar"
value="${build.home}/lib/tomcat-${component.name}.jar" />
- <property name="tomcat33-coyote.jar"
value="${build.home}/lib/tomcat33-${component.name}.jar" />
- <property name="tomcat4-coyote.jar"
value="${build.home}/lib/tomcat4-${component.name}.jar" />
-
<jar jarfile="${tomcat-coyote.jar}"
index="true"
manifest="${build.home}/conf/MANIFEST.MF">
@@ -288,18 +284,31 @@
<include name="org/apache/coyote/**"/>
</fileset>
</jar>
-
- <jar jarfile="${tomcat33-coyote.jar}"
+ </target>
+
+ <target name="tomcat4.jar" depends="static,compile.shared,compile.tomcat4"
+ description="Build Tomcat 4 Adapter jar" if="tomcat4.detect">
+ <property name="tomcat4-coyote.jar"
value="${build.home}/lib/tomcat4-${component.name}.jar" />
+ <jar jarfile="${tomcat4-coyote.jar}"
index="true"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF"
- includes="org/apache/coyote/tomcat3/**" />
+ includes="org/apache/coyote/tomcat4/**" />
+ </target>
- <jar jarfile="${tomcat4-coyote.jar}"
+ <target name="tomcat33.jar" depends="static,compile.shared,compile.tomcat33"
+ description="Build Tomcat 3.3 Adapter jar" if="tomcat33.detect">
+ <property name="tomcat33-coyote.jar"
value="${build.home}/lib/tomcat33-${component.name}.jar" />
+ <jar jarfile="${tomcat33-coyote.jar}"
index="true"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF"
- includes="org/apache/coyote/tomcat4/**" />
+ includes="org/apache/coyote/tomcat3/**" />
+ </target>
+
+ <target name="compile"
+ depends="static,report,shared.jar,tomcat4.jar,tomcat33.jar"
+ description="Compile Coyote and its Adapters">
</target>
<target name="compile.tests" depends="compile"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
