sidler 02/04/20 09:57:15
Modified: . build.xml
struts build.xml
tools build.xml
tools/xdocs index.xml
view build.xml
Log:
Modified build scripts such that they work properly if source is checked
out with the 'prune' option. (feedback from Tim Colsen)
Revision Changes Path
1.6 +4 -7 jakarta-velocity-tools/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 18 Apr 2002 14:33:06 -0000 1.5
+++ build.xml 20 Apr 2002 16:57:14 -0000 1.6
@@ -71,6 +71,7 @@
<!-- ================================================================== -->
<target name="prepare" depends="init">
<!-- Prepare build directory -->
+ <mkdir dir="${docs.dest}"/>
<mkdir dir="${docs.dest}/javadoc"/>
</target>
@@ -88,12 +89,8 @@
<!-- ================================================================== -->
<target name="clean"
description="Clean build and distribution directories">
-
- <delete>
- <fileset dir="${docs.dest}" includes="**/*.html"/>
- </delete>
-
- <delete dir="${docs.dest}/javadoc"/>
+
+ <delete dir="${docs.dest}"/>
<delete>
<fileset dir="${basedir}" includes="**/*.bak"/>
@@ -115,7 +112,7 @@
<!-- ================================================================== -->
<!-- A L L -->
<!-- ================================================================== -->
- <target name="all" depends="clean,view,library,struts,docs,javadocs"
+ <target name="all" depends="view,library,struts,docs,javadocs"
description="Build entire project, including all subprojects">
</target>
1.9 +5 -7 jakarta-velocity-tools/struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/struts/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 18 Apr 2002 14:33:06 -0000 1.8
+++ build.xml 20 Apr 2002 16:57:15 -0000 1.9
@@ -89,7 +89,7 @@
<!-- ================================================================== -->
<target name="prepare" depends="init">
<!-- Prepare build directory -->
- <mkdir dir="${basedir}/docs"/>
+ <mkdir dir="${docs.dest}"/>
<mkdir dir="${build.home}"/>
<mkdir dir="${build.home}/classes"/>
<mkdir dir="${build.home}/conf"/>
@@ -140,9 +140,7 @@
<fileset dir="${basedir}" includes="*.jar"/>
</delete>
- <delete>
- <fileset dir="${docs.dest}" includes="**/*.html"/>
- </delete>
+ <delete dir="${docs.dest}"/>
<delete>
<fileset dir="${project.repository}" includes="${project.name}-*.jar"/>
@@ -170,7 +168,7 @@
<!-- ================================================================== -->
<!-- A L L -->
<!-- ================================================================== -->
- <target name="all" depends="clean,jar,install-jar,docs,javadocs,examples"
+ <target name="all" depends="jar,install-jar,docs,javadocs,examples"
description="Build entire project"/>
@@ -259,7 +257,7 @@
<!-- ================================================================== -->
<!-- E X A M P L E S -->
<!-- ================================================================== -->
- <target name="examples" depends="clean,install-jar,docs,javadocs"
+ <target name="examples" depends="jar,install-jar,docs,javadocs"
description="Setup example application">
<!-- Setup example applications -->
@@ -296,7 +294,7 @@
<!-- ================================================================== -->
- <!-- D E M O clean, compile, docs, javadocs
-->
+ <!-- D E M O -->
<!-- ================================================================== -->
<target name="demo" depends=""
description="Generate demo package">
1.5 +3 -9 jakarta-velocity-tools/tools/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/tools/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 18 Apr 2002 14:33:06 -0000 1.4
+++ build.xml 20 Apr 2002 16:57:15 -0000 1.5
@@ -31,9 +31,6 @@
<!-- The base directory for compilation targets -->
<property name="build.home" value="${basedir}/target"/>
- <!-- The base directory for distribution targets -->
- <property name="dist.home" value="${basedir}/dist"/>
-
<!-- The base directory for component sources -->
<property name="source.home" value="${basedir}/src"/>
@@ -89,6 +86,7 @@
<!-- ================================================================== -->
<target name="prepare" depends="init"
description="Prepare build directory">
+ <mkdir dir="${docs.dest}"/>
<mkdir dir="${build.home}"/>
<mkdir dir="${build.home}/classes"/>
<mkdir dir="${build.home}/conf"/>
@@ -110,7 +108,7 @@
<!-- ================================================================== -->
<!-- A L L -->
<!-- ================================================================== -->
- <target name="all" depends="clean,jar,install-jar,docs,javadocs"
+ <target name="all" depends="jar,install-jar,docs,javadocs"
description="Build entire project"/>
@@ -122,8 +120,6 @@
<delete dir="${build.home}"/>
- <delete dir="${dist.home}"/>
-
<delete>
<fileset dir="${basedir}" includes="*.jar"/>
</delete>
@@ -132,9 +128,7 @@
<fileset dir="${project.repository}" includes="${project.name}-*.jar"/>
</delete>
- <delete>
- <fileset dir="${docs.dest}" includes="**/*.html"/>
- </delete>
+ <delete dir="${docs.dest}"/>
<delete>
<fileset dir="${basedir}" includes="**/*.bak"/>
1.2 +4 -4 jakarta-velocity-tools/tools/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/tools/xdocs/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 18 Apr 2002 14:33:07 -0000 1.1
+++ index.xml 20 Apr 2002 16:57:15 -0000 1.2
@@ -30,16 +30,16 @@
<p><strong>VelocityLibrary Content:</strong></p>
<dl>
- <dt><a
href="../tools/docs/DateTool.html"><strong>DateTool</strong></a></dt>
+ <dt><a href="DateTool.html"><strong>DateTool</strong></a></dt>
<dd>A tool for manipulating and formating dates.</dd>
- <dt><a
href="../tools/docs/MathTool.html"><strong>MathTool</strong></a></dt>
+ <dt><a href="MathTool.html"><strong>MathTool</strong></a></dt>
<dd>A tool for performing floating point math.</dd>
- <dt><a
href="../tools/docs/ParameterParser.html"><strong>ParameterParser</strong></a></dt>
+ <dt><a
href="ParameterParser.html"><strong>ParameterParser</strong></a></dt>
<dd>A tool for easy parsing of servlet request parameters.</dd>
- <dt><a
href="../tools/docs/ToolLoader.html"><strong>ToolLoader</strong></a></dt>
+ <dt><a href="ToolLoader.html"><strong>ToolLoader</strong></a></dt>
<dd>A tool allowing template designers to load view tools
from within the template.</dd>
</dl>
1.11 +3 -6 jakarta-velocity-tools/view/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/view/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 18 Apr 2002 14:33:07 -0000 1.10
+++ build.xml 20 Apr 2002 16:57:15 -0000 1.11
@@ -86,6 +86,7 @@
<mkdir dir="${build.home}/classes"/>
<mkdir dir="${build.home}/conf"/>
<mkdir dir="${build.home}/javadoc"/>
+ <mkdir dir="${docs.dest}"/>
<mkdir dir="${docs.dest}/javadoc-velservlet"/>
</target>
@@ -132,11 +133,7 @@
<delete dir="${dist.home}"/>
- <delete>
- <fileset dir="${docs.dest}" includes="**/*"/>
- </delete>
-
- <delete dir="${docs.dest}/javadoc-velservlet"/>
+ <delete dir="${docs.dest}"/>
<delete>
<fileset dir="${basedir}" includes="*.jar"/>
@@ -156,7 +153,7 @@
<!-- ================================================================== -->
<!-- A L L -->
<!-- ================================================================== -->
- <target name="all" depends="clean,jar,install-jar,docs,javadocs"
+ <target name="all" depends="jar,install-jar,docs,javadocs"
description="Build entire project"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
