summaryrefslogtreecommitdiff
path: root/java/build.xml
diff options
context:
space:
mode:
authorNuno Santos <nsantos@apache.org>2008-03-24 18:31:04 +0000
committerNuno Santos <nsantos@apache.org>2008-03-24 18:31:04 +0000
commitf7aafe13e5c2a8fe39fd89c7c4d53b0d9687f7ce (patch)
tree6c6603a43832f6ff08e99791c2f65c2827aa464b /java/build.xml
parent3f8a466daf6eba9717c27a635f2a7307cc4d03bd (diff)
downloadqpid-python-f7aafe13e5c2a8fe39fd89c7c4d53b0d9687f7ce.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/qpid@640503 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/build.xml')
-rw-r--r--java/build.xml17
1 files changed, 11 insertions, 6 deletions
diff --git a/java/build.xml b/java/build.xml
index 5b00f630d1..90ff32c7f8 100644
--- a/java/build.xml
+++ b/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>