Author: pete.muir(a)jboss.org Date: 2009-10-14 11:36:11 -0400 (Wed, 14 Oct 2009) New Revision: 4058 Modified: build/trunk/dist/build.xml Log: ws Modified: build/trunk/dist/build.xml =================================================================== --- build/trunk/dist/build.xml 2009-10-14 15:31:10 UTC (rev 4057) +++ build/trunk/dist/build.xml 2009-10-14 15:36:11 UTC (rev 4058) @@ -2,21 +2,21 @@ <project name="DistributionBuilder" default="dist" basedir="." xmlns:artifact="urn:maven-artifact-ant"> <property name="weld.dir" location="${ant.file.DistributionBuilder}/../../" /> - - <path id="maven-ant-tasks.classpath" path="${weld.dir}/lib/maven-ant-tasks.jar" /> - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> - + + <path id="maven-ant-tasks.classpath" path="${weld.dir}/lib/maven-ant-tasks.jar" /> + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> + <property file="versions.properties" /> - - <property name="maven.dir" location="${weld.dir}/lib/maven" /> - + + <property name="maven.dir" location="${weld.dir}/lib/maven" /> + <property name="dist.dir" value="${weld.dir}/dist/weld-${weld.version}" /> <property name="dist.wb.lib.dir" value="${dist.dir}/lib/weld" /> <property name="dist.doc.dir" value="${dist.dir}/doc" /> <property name="dist.apidocs.dir" value="${dist.dir}/doc/apidocs" /> - + <target name="dist" description="Build the distribution"> - + <fail unless="weld.version" message="You must specify the weld.version as a property" /> <fail unless="jsr299.version" message="You must specify the jsr299.version as a property" /> <fail unless="weld.servlet.version" message="You must specify the weld.servlet.version as a property" /> @@ -25,98 +25,98 @@ <fail unless="weld.logger.version" message="You must specify the weld.logger.version as a property" /> <fail unless="refdoc.dir" message="You must specify the reference docs directory with -Drefdoc.dir=~/workspace/wb/reference" /> <fail unless="examples.dir" message="You must specify the examples directory with -Dexamples.dir=~/workspace/wb/examples" /> - + <maven target="clean" basedir="${weld.dir}" /> <maven target="clean" basedir="${refdoc.dir}" /> <maven target="clean" basedir="${examples.dir}" /> <delete dir="${weld.dir}/jboss-as/target" /> <delete dir="${weld.dir}/impl/test-output" /> <delete dir="${weld.dir}/impl/ObjectStore" /> - <delete dir="${dist.dir}" failonerror="false"/> - <mkdir dir="${dist.dir}"/> + <delete dir="${dist.dir}" failonerror="false" /> + <mkdir dir="${dist.dir}" /> <copy todir="${dist.dir}"> - <fileset dir="${weld.dir}"> - <include name="jboss-as/**"/> - <include name="lib/**"/> - <include name="readme.txt"/> - </fileset> + <fileset dir="${weld.dir}"> + <include name="jboss-as/**" /> + <include name="lib/**" /> + <include name="readme.txt" /> + </fileset> <fileset dir="${basedir}"> - <include name="readme.txt"/> + <include name="readme.txt" /> </fileset> - </copy> - - <mkdir dir="${dist.dir}/examples"/> + </copy> + + <mkdir dir="${dist.dir}/examples" /> <copy todir="${dist.dir}/examples"> <fileset dir="${examples.dir}" /> </copy> - + <maven target="jdocbook:translate compile" basedir="${refdoc.dir}" /> <mkdir dir="${dist.doc.dir}" /> <copy todir="${dist.doc.dir}"> <fileset dir="${refdoc.dir}/target/docbook/publish"> - <include name="de-DE/**/*"/> - <include name="en-US/**/*"/> - <include name="es-ES/**/*"/> - <include name="ko-KR/**/*"/> - <include name="it-IT/**/*"/> - <include name="pt-BR/**/*"/> - <include name="zh-CN/**/*"/> - <include name="zh-TW/**/*"/> + <include name="de-DE/**/*" /> + <include name="en-US/**/*" /> + <include name="es-ES/**/*" /> + <include name="ko-KR/**/*" /> + <include name="it-IT/**/*" /> + <include name="pt-BR/**/*" /> + <include name="zh-CN/**/*" /> + <include name="zh-TW/**/*" /> </fileset> </copy> <maven target="clean" basedir="${refdoc.dir}" /> - + <artifact:dependencies filesetId="weld.fileset" versionsId="weld.versions" sourcesfilesetid="weld.sources.fileset" javadocfilesetid="weld.javadocs.fileset"> - <dependency groupId="org.jboss.weld" artifactId="jsr299-api" version="${jsr299.version}"/> - <dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}"/> - <dependency groupId="org.jboss.weld" artifactId="weld-spi" version="${weld.version}"/> - <dependency groupId="org.jboss.weld" artifactId="weld-logger" version="${weld.logger.version}"/> - <dependency groupId="org.jboss.weld" artifactId="weld-wicket" version="${weld.wicket.version}"/> - <dependency groupId="org.jboss.weld" artifactId="weld-se" version="${weld.se.version}"/> - <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet" version="${weld.servlet.version}"/> - <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet-int" version="${weld.servlet.version}"/> - <dependency groupId="org.jboss.weld.servlet" artifactId="weld-tomcat-support" version="${weld.servlet.version}"/> - <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> + <dependency groupId="org.jboss.weld" artifactId="jsr299-api" version="${jsr299.version}" /> + <dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}" /> + <dependency groupId="org.jboss.weld" artifactId="weld-spi" version="${weld.version}" /> + <dependency groupId="org.jboss.weld" artifactId="weld-logger" version="${weld.logger.version}" /> + <dependency groupId="org.jboss.weld" artifactId="weld-wicket" version="${weld.wicket.version}" /> + <dependency groupId="org.jboss.weld" artifactId="weld-se" version="${weld.se.version}" /> + <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet" version="${weld.servlet.version}" /> + <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet-int" version="${weld.servlet.version}" /> + <dependency groupId="org.jboss.weld.servlet" artifactId="weld-tomcat-support" version="${weld.servlet.version}" /> + <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> </artifact:dependencies> - - <delete dir="target" failonerror="false"/> + + <delete dir="target" failonerror="false" /> <mkdir dir="target" /> - <copy todir="target"> - <fileset refid="weld.fileset"/> - <fileset refid="weld.sources.fileset"/> - <fileset refid="weld.javadocs.fileset"/> - <chainedmapper> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${weld.versions}" to="flatten" /> - <flattenmapper /> - </chainedmapper> - </copy> - - <mkdir dir="${dist.apidocs.dir}"/> + <copy todir="target"> + <fileset refid="weld.fileset" /> + <fileset refid="weld.sources.fileset" /> + <fileset refid="weld.javadocs.fileset" /> + <chainedmapper> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${weld.versions}" to="flatten" /> + <flattenmapper /> + </chainedmapper> + </copy> + + <mkdir dir="${dist.apidocs.dir}" /> <unzip dest="${dist.apidocs.dir}"> - <fileset dir="target"> - <include name="jsr299-api-javadoc.jar"/> - <include name="weld-api-javadoc.jar"/> - </fileset> + <fileset dir="target"> + <include name="jsr299-api-javadoc.jar" /> + <include name="weld-api-javadoc.jar" /> + </fileset> </unzip> - + <mkdir dir="${dist.wb.lib.dir}" /> - - <copy todir="${dist.wb.lib.dir}"> - <fileset dir="target"> - <include name="weld-*.jar" /> - <include name="jsr299-api*.jar" /> - </fileset> - </copy> - <delete dir="target" failonerror="false"/> - + + <copy todir="${dist.wb.lib.dir}"> + <fileset dir="target"> + <include name="weld-*.jar" /> + <include name="jsr299-api*.jar" /> + </fileset> + </copy> + <delete dir="target" failonerror="false" /> + <zip destfile="weld-${weld.version}.zip"> - <fileset dir="${weld.dir}/dist"> - <include name="weld-${weld.version}/**" /> - </fileset> - </zip> + <fileset dir="${weld.dir}/dist"> + <include name="weld-${weld.version}/**" /> + </fileset> + </zip> </target> - + <target name="deploy-dist" depends="dist"> <maven target="deploy:deploy-file" basedir="${weld.dir}"> <arg line="-DpomFile=${basedir}/pom.xml" /> @@ -128,28 +128,28 @@ <arg line="-DuniqueVersion=false" /> </maven> </target> - - <macrodef name="maven"> - <attribute name="target" /> - <attribute name="basedir" /> - <element name="args" implicit="true" optional="true" /> - <sequential> - <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" maxmemory="512m" failonerror="true"> - <classpath> - <fileset dir="${maven.dir}/boot"> - <include name="*.jar" /> - </fileset> - <fileset dir="${maven.dir}/bin"> - <include name="*.*" /> - </fileset> - </classpath> - <jvmarg line="-Xms128m -Xmx512m -XX:MaxPermSize=128m"/> - <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" /> - <sysproperty key="maven.home" value="${maven.dir}" /> - <args /> - <arg line="@{target}" /> - </java> - </sequential> - </macrodef> - + + <macrodef name="maven"> + <attribute name="target" /> + <attribute name="basedir" /> + <element name="args" implicit="true" optional="true" /> + <sequential> + <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" maxmemory="512m" failonerror="true"> + <classpath> + <fileset dir="${maven.dir}/boot"> + <include name="*.jar" /> + </fileset> + <fileset dir="${maven.dir}/bin"> + <include name="*.*" /> + </fileset> + </classpath> + <jvmarg line="-Xms128m -Xmx512m -XX:MaxPermSize=128m" /> + <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" /> + <sysproperty key="maven.home" value="${maven.dir}" /> + <args /> + <arg line="@{target}" /> + </java> + </sequential> + </macrodef> + </project>