[jboss-cvs] JBossAS SVN: r57395 - branches/Branch_4_0/aspects

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2006-10-03 13:48:22 -0400 (Tue, 03 Oct 2006)
New Revision: 57395

Modified:
   branches/Branch_4_0/aspects/build.xml
Log:
[JBAOP-282] Make aspects build use the dist created by the aop build

Modified: branches/Branch_4_0/aspects/build.xml
===================================================================
--- branches/Branch_4_0/aspects/build.xml	2006-10-03 17:47:27 UTC (rev 57394)
+++ branches/Branch_4_0/aspects/build.xml	2006-10-03 17:48:22 UTC (rev 57395)
@@ -55,14 +55,20 @@
       &modules;
 
       <!-- Module name(s) & version -->
-      <property name="aspects.version" value="jboss-aspect-library-1.5"/>
-      <property name="aop.version" value="jboss-aop_1.5.2.GA"/>
+   	<!--<property name="version.suffix" value="1.5.2.GA"/>
+      <property name="aspects.version" value="jboss-aspect-library-1.5"/>-->
+   	<property name="version.suffix" value="2.0.0.alpha1"/>
+      <property name="aspects.version" value="jboss-aspect-library-2.0"/>
+      <property name="aop.version" value="jboss-aop_${version.suffix}"/>
       <property name="aspects.title" value="JBoss AOP Aspect Library"/>
 
       <property name="module.name" value="aspects"/>
       <property name="module.Name" value="JBoss Aspects"/>
 
-      <!-- Configure thirdparty libraries -->
+   	<property name="aop.dist.jar" value="jboss-aop-dist.zip"/> 
+   	<property name="aop.dist.folder" value="jboss-aop-${version.suffix}"/> 
+
+   	<!-- Configure thirdparty libraries -->
       <path id="library.classpath">
          <path refid="qdox.qdox.classpath"/>
          <path refid="javassist.classpath"/>
@@ -466,6 +472,9 @@
       <copy todir="${build.unpacked}/jboss-aop-jdk50.deployer" file="${javassist.lib}/javassist.jar"/>
       <copy todir="${build.unpacked}/jboss-aop-jdk50.deployer" file="${source.etc}/ReadMe.txt"/>
       
+   	<delete dir="output/aop"/>
+   	<unzip src="${aop.dist.jar}" dest="output/aop"/>
+   	
       <zip zipfile="${aop.version}.zip">
          <zipfileset dir="../aop/docs" prefix="${aop.version}/docs/aspect-framework">
             <include name="api/**"/>
@@ -476,7 +485,7 @@
             <exclude name="**/CVS/**"/>
             <exclude name="**/*.wiki"/>
          </zipfileset>
-         <zipfileset dir="../aop/docs/reference/build" prefix="${aop.version}/docs/aspect-framework">
+         <zipfileset dir="output/aop/${aop.dist.folder}/docs/reference/build" prefix="${aop.version}/docs/aspect-framework">
             <include name="**/*"/>
             <exclude name="**/CVS/**"/>
             <exclude name="**/*.wiki"/>
@@ -581,7 +590,7 @@
             <include name="bsh-1.3.0.jar"/>
          </zipfileset>
          
-         <zipfileset dir="../aop/src/resources/bin" prefix="${aop.version}/bin">
+         <zipfileset dir="output/aop/${aop.dist.folder}/src/resources/bin" prefix="${aop.version}/bin">
             <include name="*.sh"/>
             <include name="*.bat"/>
             <exclude name="**/CVS/**"/>
@@ -597,7 +606,7 @@
             <include name="resources/**/*.xml"/>
             <exclude name="**/CVS/**"/>
          </zipfileset>
-         <zipfileset dir="../aop/src" prefix="${aop.version}/src/aspect-framework">
+         <zipfileset dir="output/aop/${aop.dist.folder}/src" prefix="${aop.version}/src/aspect-framework">
             <include name="jdk15/**/*.java"/>
             <include name="main/**/*.java"/>
             <include name="main/**/*.xml"/>