You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/23 17:25:30 UTC
cvs commit: jakarta-turbine-maven/src/templates/build build-docs.xml build.xml
jvanzyl 02/02/23 08:25:30
Modified: . build-bootstrap.xml
src/templates/build build-docs.xml build.xml
Log:
- the documentation will now generate after the bootstrap, a little more
testing and we can get rid of the static build system.
Revision Changes Path
1.8 +7 -1 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-bootstrap.xml 23 Feb 2002 15:46:36 -0000 1.7
+++ build-bootstrap.xml 23 Feb 2002 16:25:30 -0000 1.8
@@ -127,6 +127,12 @@
<include name="src/**"/>
</fileset>
</copy>
-
+
+ <copy todir="${work.dir}">
+ <fileset dir=".">
+ <include name="xdocs/**"/>
+ </fileset>
+ </copy>
+
</target>
</project>
1.6 +2 -9 jakarta-turbine-maven/src/templates/build/build-docs.xml
Index: build-docs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-docs.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-docs.xml 23 Feb 2002 15:46:36 -0000 1.5
+++ build-docs.xml 23 Feb 2002 16:25:30 -0000 1.6
@@ -4,18 +4,11 @@
#include("build.properties.loading")
- <!-- Construct compile classpath -->
- <path id="classpath">
- <pathelement location="${dom4j.jar}"/>
- <pathelement location="${velocity.jar}"/>
- <pathelement location="${dvsl.jar}" />
- <pathelement location="${commons-collections.jar}" />
- <pathelement location="${log4j.jar}" />
- </path>
+#include("build.init.target")
<target
name="docs"
- depends="docs:index, docs:mail-lists, docs:developer-list,docs:dependencies"
+ depends="init,docs:index, docs:mail-lists, docs:developer-list,docs:dependencies"
description="o Generate html project documentation xdoc sources">
</target>
1.12 +12 -65 jakarta-turbine-maven/src/templates/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 23 Feb 2002 14:46:24 -0000 1.11
+++ build.xml 23 Feb 2002 16:25:30 -0000 1.12
@@ -318,71 +318,6 @@
</target>
<!-- ================================================================== -->
- <!-- D V S L D O C U M E N T A T I O N -->
- <!-- ================================================================== -->
-
- <target
- name="docs"
- depends="init"
- description="o Generate html project documentation xdoc sources">
-
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
- <classpath>
- <path refid="classpath"/>
- </classpath>
- </taskdef>
-
- <!-- Make sure the target directory -->
- <mkdir dir="${docs.dest}"/>
-
- <dvsl
- basedir="${docs.src}"
- destdir="${docs.dest}/"
- extension=".html"
- style="${docs.src}/stylesheets/site.dvsl"
- excludes="**/project.xml,**/template.xml"
- includes="**/*.xml"
- />
- </target>
-
- <!-- ================================================================== -->
- <!-- J A V A D O C S -->
- <!-- ================================================================== -->
-
- <target
- name="javadocs"
- depends="init"
- description="o Generates the Javadoc API documentation">
-
- <mkdir dir="${javadoc.destdir}"/>
-
- <!-- Get the year to display in the Javadocs -->
- <tstamp>
- <format property="year" pattern="${inception.year}-yyyy"/>
- </tstamp>
-
- <property
- name="copyright"
- value="Copyright &copy; ${year} ${organization}. All Rights Reserved."
- />
-
- <javadoc
- sourcepath="${src.dir}/java"
- packagenames="${package}.*"
- destdir="${javadoc.destdir}"
- author="${author}"
- private="${javadoc.private}"
- version="${javadoc.version}"
- use="${javadoc.use}"
- windowtitle="${javadoc.windowtitle}"
- doctitle="${javadoc.doctitle}"
- bottom="${copyright}">
- <classpath refid="classpath"/>
- </javadoc>
-
- </target>
-
- <!-- ================================================================== -->
<!-- G U M P D E S C R I P T O R -->
<!-- ================================================================== -->
<!-- Converts a Maven descriptor to Gump format so that projects -->
@@ -434,6 +369,18 @@
name="test">
<ant antfile="build-test.xml"/>
+ </target>
+
+ <target
+ name="docs">
+
+ <ant antfile="build-docs.xml"/>
+ </target>
+
+ <target
+ name="javadocs">
+
+ <ant antfile="build-docs.xml" target="javadocs"/>
</target>
</project>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>