You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ad...@apache.org on 2002/02/03 01:05:38 UTC
cvs commit: jakarta-ant/proposal/myrmidon antlib.xml build.xml
adammurdoch 02/02/02 16:05:38
Modified: proposal/myrmidon antlib.xml build.xml
Log:
* Fix antlib.xml so that the descriptors end up in the typelibs.
* Generate descriptors into build/gen.
Revision Changes Path
1.2 +2 -2 jakarta-ant/proposal/myrmidon/antlib.xml
Index: antlib.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/antlib.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- antlib.xml 2 Feb 2002 15:45:45 -0000 1.1
+++ antlib.xml 3 Feb 2002 00:05:38 -0000 1.2
@@ -24,7 +24,7 @@
<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 @@
<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>
1.47 +2 -0 jakarta-ant/proposal/myrmidon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- build.xml 2 Feb 2002 15:46:10 -0000 1.46
+++ build.xml 3 Feb 2002 00:05:38 -0000 1.47
@@ -59,6 +59,8 @@
<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"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>