Author: pete.muir(a)jboss.org Date: 2009-01-30 08:43:10 -0500 (Fri, 30 Jan 2009) New Revision: 1368 Modified: ri/trunk/dist/build.xml Log: Better dist :-) Modified: ri/trunk/dist/build.xml =================================================================== --- ri/trunk/dist/build.xml 2009-01-30 13:14:29 UTC (rev 1367) +++ ri/trunk/dist/build.xml 2009-01-30 13:43:10 UTC (rev 1368) @@ -12,6 +12,7 @@ <property name="dist.dir" value="${wbri.dir}/dist/webbeans-${version}" /> <property name="dist.wb.lib.dir" value="${dist.dir}/lib/webbeans" /> <property name="dist.doc.dir" value="${dist.dir}/doc" /> + <property name="dist.apidocs.dir" value="${dist.dir}/doc/apidocs" /> <property name="dist.src.dir" value="${dist.dir}/src" /> <property name="dist.src.doc.dir" value="${dist.src.dir}/reference" /> @@ -83,8 +84,8 @@ </copy> <maven target="clean" basedir="${refdoc.dir}" /> - <maven target="install" basedir="${wbri.dir}" /> - <artifact:dependencies filesetId="webbeans.fileset" versionsId="webbeans.versions"> + <maven target="javadoc:jar install" basedir="${wbri.dir}" /> + <artifact:dependencies filesetId="webbeans.fileset" versionsId="webbeans.versions" sourcesfilesetid="webbeans.sources.fileset" javadocfilesetid="webbeans.javadocs.fileset"> <dependency groupId="org.jboss.webbeans" artifactId="webbeans-ri" version="${version}"/> <dependency groupId="org.jboss.webbeans" artifactId="webbeans-ri-spi" version="${version}"/> <dependency groupId="org.jboss.webbeans" artifactId="webbeans-api" version="${version}"/> @@ -95,18 +96,27 @@ <mkdir dir="target" /> <copy todir="target"> <fileset refid="webbeans.fileset"/> + <fileset refid="webbeans.sources.fileset"/> + <fileset refid="webbeans.javadocs.fileset"/> <chainedmapper> <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${webbeans.versions}" to="flatten" /> <flattenmapper /> </chainedmapper> </copy> + <mkdir dir="${dist.apidocs.dir}"/> + <unzip dest="${dist.apidocs.dir}"> + <fileset dir="target"> + <include name="webbeans-api-javadoc.jar"/> + </fileset> + </unzip> + <mkdir dir="${dist.wb.lib.dir}" /> <copy todir="${dist.wb.lib.dir}"> <fileset dir="target"> <include name="webbeans-*.jar" /> - <include name="google*.jar" /> + <include name="google-collections.jar" /> </fileset> </copy> <delete dir="target" failonerror="false"/>