[webbeans-commits] Webbeans SVN: r623 - ri/trunk.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-12-20 12:32:42 -0500 (Sat, 20 Dec 2008)
New Revision: 623

Modified:
   ri/trunk/build.xml
Log:
add deploy-dist target

Modified: ri/trunk/build.xml
===================================================================
--- ri/trunk/build.xml	2008-12-20 17:14:43 UTC (rev 622)
+++ ri/trunk/build.xml	2008-12-20 17:32:42 UTC (rev 623)
@@ -6,7 +6,8 @@
    
    <property name="maven.dir" location="${basedir}/lib/maven" />
 	
-	<property name="dist.dir" value="dist" />
+	<property name="dist.dir" value="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.src.dir" value="${dist.dir}/src" />
 	<property name="dist.src.doc.dir" value="${dist.src.dir}/reference" />
@@ -14,8 +15,14 @@
 	<property name="refdoc.dir" value="reference-guide" />
 	
 	<target name="dist" description="Build the distribution">
+		
+		<fail unless="version" message="You must specify the version with -Dversion=1.2.3" />
+		
 		<maven target="clean" basedir="${basedir}" />
 		<maven target="clean" basedir="${refdoc.dir}" />
+		<delete dir="${basedir}/jboss-as/target" />
+		<delete dir="${basedir}/webbeans-ri/test-output" />
+		<delete dir="${basedir}/webbeans-ri/ObjectStore" />
 		<delete dir="${dist.dir}" failonerror="false"/>
 		<mkdir dir="${dist.dir}"/>
 		
@@ -24,13 +31,22 @@
       <copy todir="${dist.src.dir}">
          <fileset dir="${basedir}">
             <include name="webbeans-ri/**" />
+         	<include name="webbeans-ri-spi/**" />
          	<include name="webbeans-api/**" />
          	<include name="pom.xml" />
+         	<exclude name="**/.settings/**" />
+         	<exclude name="**/.classpath" />
+         	<exclude name="**/.project" />
          </fileset>
       </copy>
 		
 		<copy todir="${dist.src.doc.dir}">
-			<fileset dir="${refdoc.dir}"/>
+			<fileset dir="${refdoc.dir}">
+				<exclude name="**/.settings/**" />
+            <exclude name="**/.classpath" />
+            <exclude name="**/.project" />
+				<exclude name="**/*.pdf" />
+			</fileset>
       </copy>
 
 		<copy todir="${dist.dir}">
@@ -38,6 +54,7 @@
             <include name="examples/**"/>
          	<include name="jboss-as/**"/>
          	<include name="lib/**"/>
+         	<include name="readme.txt"/>
          </fileset>
       </copy>
 		
@@ -48,8 +65,50 @@
 		</copy>
 		<maven target="clean" basedir="${refdoc.dir}" />
 		
+		<maven target="install" basedir="${basedir}" />
+		<artifact:dependencies filesetId="webbeans.fileset" versionsId="webbeans.versions">
+		   <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}"/>
+		   <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="webbeans.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.wb.lib.dir}" />
+		
+	   <copy todir="${dist.wb.lib.dir}">
+         <fileset dir="target">
+            <include name="webbeans-*.jar" />
+            <include name="google*.jar" />
+         </fileset>
+      </copy>
+		<delete dir="target" failonerror="false"/>
+		
+		<zip destfile="webbeans-${version}.zip">
+         <fileset dir="${basedir}/dist">
+         	<include name="webbeans-${version}/**" />
+         </fileset>
+      </zip>
 	</target>
 	
+	<target name="deploy-dist" depends="dist">
+		<maven target="install:install-file" basedir="${basedir}">
+			<arg line="-DpomFile=${basedir}/webbeans-ri/pom.xml" />
+			<arg line="-Dpackaging=zip" />
+			<arg line="-Dversion=${version}" />
+			<arg line="-Dfile=${basedir}/webbeans-${version}.zip" />
+		</maven>
+	</target>
+	
    <macrodef name="maven">
       <attribute name="target" />
       <attribute name="basedir" />