[jboss-cvs] JBossAS SVN: r69349 - in projects/aop/trunk: tools/etc/buildmagic and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2008-01-25 10:52:32 -0500 (Fri, 25 Jan 2008)
New Revision: 69349

Modified:
   projects/aop/trunk/build/build.xml
   projects/aop/trunk/tools/etc/buildmagic/buildmagic.ent
Log:
[JBAOP-511] Add root dir to release archive

Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml	2008-01-25 15:31:28 UTC (rev 69348)
+++ projects/aop/trunk/build/build.xml	2008-01-25 15:52:32 UTC (rev 69349)
@@ -221,7 +221,9 @@
       <ant antfile="build-release.xml" target="release-reference-docs"/>
 
    	<zip destfile="${project.release}.zip">
-         <fileset dir="${project.release}"/>
+         <fileset dir="${project.output}">
+         	<include name="${aop.version}/**"/>
+   		</fileset>
       </zip>
    	<move file="${project.release}.zip" todir="${module.output}/lib"/>
   </target>
@@ -232,7 +234,7 @@
     <ant antfile="build-release.xml" target="release-no-reference-docs"/>
     <ant antfile="build-release.xml" target="release-reference-docs"/>
   </target>
-
+	
   <!-- ================================================================== -->
   <!-- Source Archives                                                    -->
   <!-- ================================================================== -->

Modified: projects/aop/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- projects/aop/trunk/tools/etc/buildmagic/buildmagic.ent	2008-01-25 15:31:28 UTC (rev 69348)
+++ projects/aop/trunk/tools/etc/buildmagic/buildmagic.ent	2008-01-25 15:52:32 UTC (rev 69349)
@@ -49,7 +49,8 @@
   <property name="project.build" value="${project.root}/build"/>
   <property name="project.tools" value="${project.root}/tools"/>
   <property name="project.thirdparty" value="${project.root}/thirdparty"/>
-  <property name="project.release" value="${project.build}/output/${aop.version}"/>
+  <property name="project.output" value="${project.build}/output"/>
+  <property name="project.release" value="${project.output}/${aop.version}"/>
 
 
   <!-- Setup the module environment. -->