svn commit: r617321 - in /incubator/qpid/trunk/qpid/java: build.xml module.xml

[rh...@apache.org]

Author: rhs
Date: Thu Jan 31 17:25:27 2008
New Revision: 617321

URL: http://svn.apache.org/viewvc?rev=617321&view=rev
Log:
futzed with deps for faster build, and fixed bug in manifest generation

Modified:
    incubator/qpid/trunk/qpid/java/build.xml
    incubator/qpid/trunk/qpid/java/module.xml

Modified: incubator/qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?rev=617321&r1=617320&r2=617321&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Thu Jan 31 17:25:27 2008
@@ -29,6 +29,7 @@
   <property name="modules"            value="${modules.core} ${modules.tests} ${modules.management}"/>
 
   <property name="qpid.jar"           location="${build.lib}/qpid-incubating.jar"/>
+  <basename property="qpid.jar.name"  file="${qpid.jar}"/>
 
   <map property="release.excludes" value="${modules}">
     <regexpmapper from="(.*)" to="\1/**"/>
@@ -81,14 +82,14 @@
 
   <target name="check-manifest">
     <uptodate property="manifest.done" targetfile="${qpid.jar}">
-      <srcfiles dir="${build.lib}" includes="**/*.jar"/>
+      <srcfiles dir="${build.lib}" includes="**/*.jar" excludes="**/${qpid.jar.name}"/>
     </uptodate>
   </target>
 
-  <target name="manifest" depends="jar,libs,check-manifest" unless="manifest.done">
+  <target name="manifest" depends="check-manifest" unless="manifest.done">
     <manifestclasspath property="qpid.jar.classpath" jarfile="${qpid.jar}">
       <classpath>
-        <fileset dir="${build.lib}" includes="**/*.jar"/>
+        <fileset dir="${build.lib}" includes="**/*.jar" excludes="**/${qpid.jar.name}"/>
       </classpath>
     </manifestclasspath>
 
@@ -97,10 +98,13 @@
         <attribute name="Class-Path" value="${qpid.jar.classpath}"/>
       </manifest>
     </jar>
+
+    <touch file="${qpid.jar}"/>
   </target>
 
-  <target name="build" depends="manifest" description="compile and copy resources into build tree">
+  <target name="build" description="build distribution">
     <iterate target="build"/>
+    <antcall target="manifest"/>
   </target>
 
   <target name="prepare">

Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=617321&r1=617320&r2=617321&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Thu Jan 31 17:25:27 2008
@@ -169,7 +169,7 @@
     </junit>
   </target>
 
-  <target name="build" depends="compile" description="compile and copy resources into build tree">
+  <target name="build" depends="jar,libs" description="compile and copy resources into build tree">
     <copy todir="${build.bin}" failonerror="false">
       <fileset dir="${module.bin}"/>
     </copy>