diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2008-02-01 01:25:27 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2008-02-01 01:25:27 +0000 |
| commit | 9a0b1fa7841994bb8ae150e267f1728c4ca12ca6 (patch) | |
| tree | 2090882cbb93a3541f58b47c4cb2f8c25edeafac /java/build.xml | |
| parent | a03af401ba693ade452dae7d0e4042d41636d12c (diff) | |
| download | qpid-python-9a0b1fa7841994bb8ae150e267f1728c4ca12ca6.tar.gz | |
futzed with deps for faster build, and fixed bug in manifest generation
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@617321 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/build.xml')
| -rw-r--r-- | java/build.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/java/build.xml b/java/build.xml index 33c09f09a8..cb43754435 100644 --- a/java/build.xml +++ b/java/build.xml @@ -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"> |