rwaldhoff 2003/09/15 22:32:54 Modified: collections build.xml maven.xml Log: generate object and primitive jars in both maven and ant Revision Changes Path 1.39 +17 -1 jakarta-commons/collections/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons/collections/build.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- build.xml 13 Jan 2003 23:54:38 -0000 1.38 +++ build.xml 16 Sep 2003 05:32:54 -0000 1.39 @@ -71,6 +71,8 @@ <property name="dest.doc.api" value="${dest.doc}/api"/> <property name="dest.jardir" value="${dest}"/> <property name="dest.jardir.jar" value="${dest.jardir}/${name}.jar"/> + <property name="dest.jardir.object-jar" value="${dest.jardir}/${name}-object.jar"/> + <property name="dest.jardir.primitive-jar" value="${dest.jardir}/${name}-primitive.jar"/> <property name="bin.name" value="${name}-${component.version}"/> <property name="dest.bin.tar" value="${dest}/${bin.name}.tar"/> @@ -266,6 +268,20 @@ <jar jarfile="${dest.jardir.jar}" manifest="${source.src}/conf/MANIFEST.MF"> <fileset dir="${workdir}"/> </jar> + + <jar jarfile="${dest.jardir.object-jar}" manifest="${source.src}/conf/MANIFEST.MF"> + <fileset dir="${workdir}"> + <exclude name="org/apache/commons/collections/primitives/**"/> + </fileset> + </jar> + + <jar jarfile="${dest.jardir.primitive-jar}" manifest="${source.src}/conf/MANIFEST.MF"> + <fileset dir="${workdir}"> + <include name="META-INF/**"/> + <include name="org/apache/commons/collections/primitives/**"/> + </fileset> + </jar> + <delete dir="${workdir}"/> <delete dir="${dest.classes}"/> 1.3 +25 -1 jakarta-commons/collections/maven.xml Index: maven.xml =================================================================== RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- maven.xml 26 Feb 2003 01:33:22 -0000 1.2 +++ maven.xml 16 Sep 2003 05:32:54 -0000 1.3 @@ -1,6 +1,30 @@ -<project default="java:jar" xmlns:j="jelly:core"> +<project default="java:jar" xmlns:j="jelly:core" xmlns:ant="jelly:ant"> <postGoal name="clover:on"> <j:set var="maven.junit.sysproperties" value="${maven.junit.sysproperties} org.apache.commons.collections:with-clover"/> <j:set var="org.apache.commons.collections:with-clover" value="true"/> </postGoal> + + <postGoal name="jar:jar"> + <ant:tstamp/> + <ant:property name="workdir" value="${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}"/> + <ant:unjar dest="${workdir}" src="${maven.build.dir}/${maven.final.name}.jar"/> + + <ant:jar jarfile="${maven.build.dir}/${pom.artifactId}-object-${pom.currentVersion}.jar" manifest="${workdir}/META-INF/MANIFEST.MF"> + <ant:fileset dir="${workdir}"> + <ant:exclude name="org/apache/commons/collections/primitives/**"/> + <ant:exclude name="META-INF/INDEX.LIST"/> + </ant:fileset> + </ant:jar> + + <ant:jar jarfile="${maven.build.dir}/${pom.artifactId}-primitive-${pom.currentVersion}.jar" manifest="${workdir}/META-INF/MANIFEST.MF"> + <ant:fileset dir="${workdir}"> + <ant:include name="META-INF/**"/> + <ant:exclude name="META-INF/INDEX.LIST"/> + <ant:include name="org/apache/commons/collections/primitives/**"/> + </ant:fileset> + </ant:jar> + + <delete dir="${workdir}"/> + </postGoal> + </project>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]