svn commit: r792650 - in /qpid/trunk/qpid/java: common.xml module.xml

[rh...@apache.org]

Author: rhs
Date: Thu Jul  9 19:35:55 2009
New Revision: 792650

URL: http://svn.apache.org/viewvc?rev=792650&view=rev
Log:
refrain from using anything other than filesets inside copy, this makes the build backwards compatible to pre 1.7 versions of ant

Modified:
    qpid/trunk/qpid/java/common.xml
    qpid/trunk/qpid/java/module.xml

Modified: qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=792650&r1=792649&r2=792650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Thu Jul  9 19:35:55 2009
@@ -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>

Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=792650&r1=792649&r2=792650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Thu Jul  9 19:35:55 2009
@@ -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}"/>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org