From 782824df160ca70d45041e63427a1589e64cc4c7 Mon Sep 17 00:00:00 2001
From: adammurdoch <dev-null@apache.org>
Date: Sun, 3 Feb 2002 00:05:38 +0000
Subject: [PATCH] * Fix antlib.xml so that the descriptors end up in the
 typelibs. * Generate descriptors into build/gen.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271093 13f79535-47bb-0310-9956-ffa450edef68
---
 proposal/myrmidon/antlib.xml | 4 ++--
 proposal/myrmidon/build.xml  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/proposal/myrmidon/antlib.xml b/proposal/myrmidon/antlib.xml
index fdb09465a..75e7287f4 100644
--- a/proposal/myrmidon/antlib.xml
+++ b/proposal/myrmidon/antlib.xml
@@ -24,7 +24,7 @@ Legal:
   <property name="lib.dir" value="lib"/>
 
   <!-- directory where you place generated code -->
-  <property name="gen.dir" value="gen"/>
+  <property name="gen.dir" value="${build.dir}/gen"/>
 
   <property name="antlib.name" value="NONAME"/>
   <property name="antlib.include" value="org/apache/antlib/${antlib.name}/**"/>
@@ -66,7 +66,7 @@ Legal:
   <target name="jar" depends="xdoclet">
     <jar jarfile="${build.lib}/${antlib.name}.atl" basedir="${build.classes}">
       <include name="${antlib.include}" />
-      <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-descriptor.xml">
+      <zipfileset dir="${gen.dir}" fullpath="META-INF/ant-descriptor.xml">
         <include name="${antlib.descriptor}"/>
       </zipfileset>
     </jar>
diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml
index 60cb92871..f8f5c064b 100644
--- a/proposal/myrmidon/build.xml
+++ b/proposal/myrmidon/build.xml
@@ -59,6 +59,8 @@ Legal:
   <property name="dist.lib" value="${dist.dir}/lib"/>
   <property name="dist.ext" value="${dist.dir}/ext"/>
 
+  <property name="gen.dir" value="${build.dir}/gen"/>
+
   <property name="test.dir" value="${build.dir}/test"/>
   <property name="test.working.dir" value="${test.dir}/testcases"/>
   <property name="test.classes" value="${test.dir}/classes"/>