diff options
| author | Nuno Santos <nsantos@apache.org> | 2008-03-24 18:31:04 +0000 |
|---|---|---|
| committer | Nuno Santos <nsantos@apache.org> | 2008-03-24 18:31:04 +0000 |
| commit | d77dff21bed507d6ff708539eb4670466a1d4171 (patch) | |
| tree | 3585c43d6cc9f90674cc960b4f02ded05218c6a0 /qpid/java/build.xml | |
| parent | 65a26e7d25cf8155693981b0f2b245cc1dff8f0f (diff) | |
| download | qpid-python-d77dff21bed507d6ff708539eb4670466a1d4171.tar.gz | |
make build.xml files backward-compatible with ant 1.6.5, by replacing ant 1.7 specific tasks/extensions
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@640503 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/build.xml')
| -rw-r--r-- | qpid/java/build.xml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/qpid/java/build.xml b/qpid/java/build.xml index 5b00f630d1..90ff32c7f8 100644 --- a/qpid/java/build.xml +++ b/qpid/java/build.xml @@ -33,7 +33,7 @@ <basename property="qpid.jar.name" file="${qpid.jar}"/> <map property="release.excludes" value="${modules}"> - <regexpmapper from="(.*)" to="\1/**"/> + <globmapper from="*" to="*/\*\*"/> </map> <property name="release.zip" location="${release}/${project.namever}.zip"/> @@ -88,11 +88,16 @@ </target> <target name="manifest" depends="check-manifest" unless="manifest.done"> - <manifestclasspath property="qpid.jar.classpath" jarfile="${qpid.jar}"> - <classpath> - <fileset dir="${build.lib}" includes="**/*.jar" excludes="**/${qpid.jar.name}"/> - </classpath> - </manifestclasspath> + <path id="class.path"> + <fileset dir="${build.lib}" > + <include name="*.jar"/> + <exclude name="${qpid.jar.name}"/> + </fileset> + </path> + <pathconvert property="qpid.jar.classpath" pathsep=":" dirsep="/"> + <path refid="class.path"/> + <map from="${basedir}" to="lib/"/> + </pathconvert> <jar destfile="${qpid.jar}"> <manifest> |