[weld-commits] Weld SVN: r5032 - build/trunk/dist.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Fri Nov 13 11:08:11 EST 2009
Author: pete.muir at jboss.org
Date: 2009-11-13 11:08:11 -0500 (Fri, 13 Nov 2009)
New Revision: 5032
Modified:
build/trunk/dist/build.xml
Log:
ws
Modified: build/trunk/dist/build.xml
===================================================================
--- build/trunk/dist/build.xml 2009-11-13 16:06:15 UTC (rev 5031)
+++ build/trunk/dist/build.xml 2009-11-13 16:08:11 UTC (rev 5032)
@@ -1,161 +1,161 @@
<?xml version="1.0"?>
<project name="DistributionBuilder" default="dist" basedir="." xmlns:artifact="urn:maven-artifact-ant">
- <property name="parent.dir" location="${ant.file.DistributionBuilder}/../../" />
+ <property name="parent.dir" location="${ant.file.DistributionBuilder}/../../" />
- <path id="maven-ant-tasks.classpath" path="${parent.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="${parent.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 file="versions.properties" />
- <property name="maven.dir" location="${parent.dir}/lib/maven" />
+ <property name="maven.dir" location="${parent.dir}/lib/maven" />
- <property name="dist.dir" value="${basedir}/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="setup">
- <fail unless="examples.dir" message="You must specify the examples directory with -Dexamples.dir=~/workspace/examples" />
- <fail unless="weld.dir" message="You must specify the examples directory with -Dweld.dir=~/workspace/weld" />
+ <property name="dist.dir" value="${basedir}/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="setup">
+ <fail unless="examples.dir" message="You must specify the examples directory with -Dexamples.dir=~/workspace/examples" />
+ <fail unless="weld.dir" message="You must specify the examples directory with -Dweld.dir=~/workspace/weld" />
<maven target="clean" basedir="${examples.dir}" />
<delete dir="${weld.dir}/jboss-as/target" />
<delete dir="${dist.dir}" failonerror="false" />
<mkdir dir="${dist.dir}" />
- </target>
+ </target>
- <target name="dist" description="Build the distribution" depends="setup, docs">
+ <target name="dist" description="Build the distribution" depends="setup, docs">
- <fail unless="weld.version" message="You must specify the weld.version as a property" />
- <fail unless="weld.api.version" message="You must specify the weld.api.version as a property" />
- <fail unless="weld.servlet.version" message="You must specify the weld.servlet.version as a property" />
- <fail unless="weld.se.version" message="You must specify the weld.se.version as a property" />
- <fail unless="weld.wicket.version" message="You must specify the weld.wicket.version as a property" />
- <fail unless="weld.logger.version" message="You must specify the weld.logger.version as a property" />
+ <fail unless="weld.version" message="You must specify the weld.version as a property" />
+ <fail unless="weld.api.version" message="You must specify the weld.api.version as a property" />
+ <fail unless="weld.servlet.version" message="You must specify the weld.servlet.version as a property" />
+ <fail unless="weld.se.version" message="You must specify the weld.se.version as a property" />
+ <fail unless="weld.wicket.version" message="You must specify the weld.wicket.version as a property" />
+ <fail unless="weld.logger.version" message="You must specify the weld.logger.version as a property" />
<fail unless="weld.dir" message="You must specify the examples directory with -Dweld.dir=~/workspace/weld" />
- <fail unless="examples.dir" message="You must specify the examples directory with -Dexamples.dir=~/workspace/examples" />
+ <fail unless="examples.dir" message="You must specify the examples directory with -Dexamples.dir=~/workspace/examples" />
- <copy todir="${dist.dir}">
- <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="apl.txt" />
- </fileset>
- </copy>
+ <copy todir="${dist.dir}">
+ <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="apl.txt" />
+ </fileset>
+ </copy>
- <mkdir dir="${dist.dir}/examples" />
- <copy todir="${dist.dir}/examples">
- <fileset dir="${examples.dir}" />
- </copy>
+ <mkdir dir="${dist.dir}/examples" />
+ <copy todir="${dist.dir}/examples">
+ <fileset dir="${examples.dir}" />
+ </copy>
- <artifact:dependencies filesetId="weld.fileset" versionsId="weld.versions" sourcesfilesetid="weld.sources.fileset" javadocfilesetid="weld.javadocs.fileset">
- <dependency groupId="javax.enterprise" artifactId="cdi-api" version="${weld.api.version}" />
- <dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}" />
- <dependency groupId="org.jboss.weld" artifactId="weld-spi" version="${weld.api.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>
+ <artifact:dependencies filesetId="weld.fileset" versionsId="weld.versions" sourcesfilesetid="weld.sources.fileset" javadocfilesetid="weld.javadocs.fileset">
+ <dependency groupId="javax.enterprise" artifactId="cdi-api" version="${weld.api.version}" />
+ <dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}" />
+ <dependency groupId="org.jboss.weld" artifactId="weld-spi" version="${weld.api.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" />
- <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>
+ <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}" />
- <unzip dest="${dist.apidocs.dir}">
- <fileset dir="target">
- <include name="cdi-api-javadoc.jar" />
- <include name="weld-api-javadoc.jar" />
- </fileset>
- </unzip>
+ <mkdir dir="${dist.apidocs.dir}" />
+ <unzip dest="${dist.apidocs.dir}">
+ <fileset dir="target">
+ <include name="cdi-api-javadoc.jar" />
+ <include name="weld-api-javadoc.jar" />
+ </fileset>
+ </unzip>
- <mkdir dir="${dist.wb.lib.dir}" />
+ <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="${basedir}">
- <include name="weld-${weld.version}/**" />
- </fileset>
- </zip>
- </target>
+ <zip destfile="weld-${weld.version}.zip">
+ <fileset dir="${basedir}">
+ <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" />
- <arg line="-Dpackaging=zip" />
- <arg line="-Dversion=${weld.version}" />
- <arg line="-Dfile=${basedir}/weld-${weld.version}.zip" />
- <arg line="-Durl=dav:https://snapshots.jboss.org/maven2" />
- <arg line="-DrepositoryId=snapshots.jboss.org" />
- <arg line="-DuniqueVersion=false" />
- </maven>
- </target>
+ <target name="deploy-dist" depends="dist">
+ <maven target="deploy:deploy-file" basedir="${weld.dir}">
+ <arg line="-DpomFile=${basedir}/pom.xml" />
+ <arg line="-Dpackaging=zip" />
+ <arg line="-Dversion=${weld.version}" />
+ <arg line="-Dfile=${basedir}/weld-${weld.version}.zip" />
+ <arg line="-Durl=dav:https://snapshots.jboss.org/maven2" />
+ <arg line="-DrepositoryId=snapshots.jboss.org" />
+ <arg line="-DuniqueVersion=false" />
+ </maven>
+ </target>
- <target name="docs">
- <fail unless="refdoc.dir" message="You must specify the reference docs directory with -Drefdoc.dir=~/workspace/wb/reference" />
+ <target name="docs">
+ <fail unless="refdoc.dir" message="You must specify the reference docs directory with -Drefdoc.dir=~/workspace/wb/reference" />
<maven target="clean" basedir="${refdoc.dir}" />
- <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/**/*" />
- </fileset>
- </copy>
- <maven target="clean" basedir="${refdoc.dir}" />
- </target>
+ <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/**/*" />
+ </fileset>
+ </copy>
+ <maven target="clean" basedir="${refdoc.dir}" />
+ </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>
More information about the weld-commits
mailing list