diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2009-07-09 19:35:55 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2009-07-09 19:35:55 +0000 |
| commit | 5a48e3da672620aa5905babcd1d457e07c0afd80 (patch) | |
| tree | 5f76c67763b40c3829695f72d1e3dc8bab083ffb /java | |
| parent | 101aabaaf518ff65349fb80200cb12a601d8b8ff (diff) | |
| download | qpid-python-5a48e3da672620aa5905babcd1d457e07c0afd80.tar.gz | |
refrain from using anything other than filesets inside copy, this makes the build backwards compatible to pre 1.7 versions of ant
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@792650 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/common.xml | 13 | ||||
| -rw-r--r-- | java/module.xml | 8 |
2 files changed, 15 insertions, 6 deletions
diff --git a/java/common.xml b/java/common.xml index fdac37f846..3393be7070 100644 --- a/java/common.xml +++ b/java/common.xml @@ -111,6 +111,19 @@ <taskdef name="foreach" classname="org.apache.qpid.tasks.Foreach" classpath="${tasks.classes}"/> + <macrodef name="copylist"> + <attribute name="todir"/> + <attribute name="dir"/> + <attribute name="files"/> + <sequential> + <foreach property="file" list="@{files}"> + <copy todir="@{todir}" flatten="true"> + <fileset dir="@{dir}" includes="${file}"/> + </copy> + </foreach> + </sequential> + </macrodef> + <target name="clean-tasks"> <delete dir="${tasks.classes}"/> </target> diff --git a/java/module.xml b/java/module.xml index f87b841f8e..d57ec631b1 100644 --- a/java/module.xml +++ b/java/module.xml @@ -352,9 +352,7 @@ </target> <target name="libs" description="copy dependencies into build tree"> - <copy todir="${build.lib}" failonerror="false" flatten="true"> - <filelist dir="${project.root}" files="${module.libs}"/> - </copy> + <copylist todir="${build.lib}" dir="${project.root}" files="${module.libs}"/> </target> <map property="module.depends.jars" value="${module.depends}" join=","> @@ -364,9 +362,7 @@ <target name="libs-release" description="copy dependencies into module release"> <!-- Copy the module dependencies --> - <copy todir="${module.release}" failonerror="true"> - <filelist dir="${basedir}${file.separator}.." files="${module.libs}"/> - </copy> + <copylist todir="${module.release}" dir="${project.root}" files="${module.libs}"/> <!-- Copy the jar for this module --> <copy todir="${module.release}/lib" failonerror="true"> <fileset file="${module.jar}"/> |