adammurdoch 02/05/12 04:17:05
Modified: tools/xsl build.xsl
Log:
Fix up-to-date checking for antlib descriptors.
Revision Changes Path
1.16 +7 -5 jakarta-ant-myrmidon/tools/xsl/build.xsl
Index: build.xsl
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/tools/xsl/build.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xsl 12 May 2002 04:03:32 -0000 1.15
+++ build.xsl 12 May 2002 11:17:05 -0000 1.16
@@ -381,11 +381,13 @@
<xsl:template match="jar">
<xsl:variable name="patterns" select="patternset"/>
- <target name="jar-{id}" depends="jar-{id}-prepare,
jar-{id}-descriptors, jar-{id}-package"/>
+ <target name="jar-{id}-test-omit" if="xdoclet.omit">
+ <property name="{id}-xdoclet.omit" value="yep"/>
+ </target>
- <target name="jar-{id}-prepare" unless="xdoclet.omit">
+ <target name="jar-{id}-prepare" depends="jar-{id}-test-omit"
unless="{id}-xdoclet.omit">
<uptodate targetfile="${{build.conf}}/{id}/ant-descriptor.xml"
- property="xdoclet.omit">
+ property="{id}-xdoclet.omit">
<xsl:for-each select="../sourceDirectory">
<srcfiles dir="{.}">
<patternset refid="project.compile.patternset"/>
@@ -395,7 +397,7 @@
</uptodate>
</target>
- <target name="jar-{id}-descriptors" unless="xdoclet.omit">
+ <target name="jar-{id}-descriptors" depends="jar-{id}-prepare"
unless="{id}-xdoclet.omit">
<!-- Generate the descriptors -->
<xsl:if test="not(includeDescriptors = 'false')">
<mkdir dir="${{build.conf}}/{id}"/>
@@ -417,7 +419,7 @@
</xsl:if>
</target>
- <target name="jar-{id}-package">
+ <target name="jar-{id}" depends="jar-{id}-descriptors">
<mkdir dir="${{build.conf}}/{id}"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
