ehatcher 02/02/27 11:39:32
Modified: proposal/xdocs build.xml
proposal/xdocs/templates defaults_properties.template
Log:
Fixed some issues with defaults.properties generation. Fixed issue with build
having to be run twice because of directory being removed from the path
(*arg*!).
Revision Changes Path
1.2 +16 -14 jakarta-ant/proposal/xdocs/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/xdocs/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 27 Feb 2002 05:26:03 -0000 1.1
+++ build.xml 27 Feb 2002 19:39:32 -0000 1.2
@@ -18,22 +18,19 @@
location="${template.dir}/task_xdoc.template"/>
- <path id="xdoclet.classpath">
- <pathelement location="${log4j.jar}"/>
- <pathelement location="${xdoclet.jar}"/>
-
- <!-- javadoc is needed -->
- <pathelement path="${java.class.path}"/>
- <pathelement location="${build.dir}"/>
- </path>
-
- <taskdef name="document"
- classname="xdoclet.doc.DocumentDocletTask"
- classpathref="xdoclet.classpath"/>
-
<target name="init">
<mkdir dir="${build.dir}" />
<mkdir dir="${gen.dir}" />
+
+ <!-- hack, this should be outside a target but ${build.dir} gets
stripped ?? -->
+ <path id="xdoclet.classpath">
+ <pathelement location="${log4j.jar}"/>
+ <pathelement location="${xdoclet.jar}"/>
+
+ <!-- javadoc is needed -->
+ <pathelement path="${java.class.path}"/>
+ <pathelement location="${build.dir}"/>
+ </path>
</target>
@@ -49,6 +46,10 @@
<target name="gen" depends="compile">
<delete dir="${gen.dir}"/>
+ <taskdef name="document"
+ classname="xdoclet.doc.DocumentDocletTask"
+ classpathref="xdoclet.classpath"/>
+
<document sourcepath="${src.root}"
destdir="${gen.dir}"
classpathref="xdoclet.classpath">
@@ -56,7 +57,8 @@
<include name="*.java" unless="class.name"/>
<include name="${class.name}.java" if="class.name"/>
</fileset>
- <template templateFile="${defaults.properties.template}"
+ <template subTaskClassName="org.apache.tools.ant.xdoclet.AntSubTask"
+ templateFile="${defaults.properties.template}"
destinationfile="defaults.properties"/>
<!-- <template templateFile="${xdoc.template}"
destinationfile="{0}.xml" extent="concrete-type"/> -->
1.2 +2 -3
jakarta-ant/proposal/xdocs/templates/defaults_properties.template
Index: defaults_properties.template
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/xdocs/templates/defaults_properties.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- defaults_properties.template 27 Feb 2002 05:26:03 -0000 1.1
+++ defaults_properties.template 27 Feb 2002 19:39:32 -0000 1.2
@@ -1,5 +1,4 @@
<XDtTagDef:tagDef namespace="Ant"
handler="org.apache.tools.ant.xdoclet.AntTagsHandler"/>
-<!-- @todo: add forAllTasks -->
-<XDtClass:forAllClasses>
+<XDtAnt:forAllTasks>
<XDtAnt:taskName/>=<XDtClass:fullClassName/>
-</XDtClass:forAllClasses>
+</XDtAnt:forAllTasks>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
