svn commit: rev 22229 - avalon/trunk/runtime/merlin/cli

Author: mcconnell
Date: Sun Jun 27 23:21:06 2004
New Revision: 22229

Modified:
   avalon/trunk/runtime/merlin/cli/build.xml
Log:
fix a bug in the build procedure when building against a clean repository

Modified: avalon/trunk/runtime/merlin/cli/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.xml	(original)
+++ avalon/trunk/runtime/merlin/cli/build.xml	Sun Jun 27 23:21:06 2004
@@ -31,12 +31,25 @@
     </copy>
     <mkdir dir="target/merlin/lib"/>
     <mkdir dir="target/merlin/system"/>
+
+    <echo>GROUP: ${project.group}</echo>
+    <echo>NAME: ${project.name}</echo>
+
     <copy todir="target/merlin/system">
       <fileset dir="${magic.cache}">
         <include name="avalon/**"/>
         <include name="commons-cli/jars/commons-cli-1.0.jar"/>
         <exclude name="avalon/test/**"/>
         <exclude name="avalon/tools/**"/>
+        <exclude name="avalon/merlin/dist/**"/>
+        <exclude name="avalon/merlin/jars/${project.name}**"/>
+        <exclude name="avalon/planet/**"/>
+      </fileset>
+    </copy>
+    <copy todir="target/merlin/system/${project.group}/jars">
+      <fileset dir="target/deliverables/jars">
+        <include name="${project.name}*.jar"/>
+        <include name="${project.name}*.jar.*"/>
       </fileset>
     </copy>
     <copy todir="target/merlin" file="target/build/etc/merlin.properties.template"/>