sidler 02/04/16 07:09:07
Modified: . README.txt build.xml
struts build.xml
struts/examples/struts build.xml
tools build.xml
view build.xml
xdocs site.dvsl
Removed: struts/examples/struts/WEB-INF/lib
velocity-tools-library-0.1.jar
velocity-tools-view-0.6.jar
struts/lib velocity-tools-view-0.6.jar
tools/lib velocity-tools-view-0.6.jar
Log:
Created new 'all' target to build entire project, including all subprojects. See
README in root dir for the new very simple build process. It is still possible
to build subprojects individually. Super 'all' target calls 'all' targets of
subprojects to do its job.
Revision Changes Path
1.6 +42 -26 jakarta-velocity-tools/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/README.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README.txt 15 Apr 2002 18:30:27 -0000 1.5
+++ README.txt 16 Apr 2002 14:09:06 -0000 1.6
@@ -1,42 +1,58 @@
R E A D M E
===========
-Contents
---------
+Welcome to the VelocityTools projects. This project is an umbrella
+for three subprojects:
+
+
+VelocityServlet
+
+ A general-purpose servlet for rendering Velocity templates.
+ There is no controller functionality - it's akin to the
+ JspServlet. It includes toolbox support. See view/README.txt
+ for more information.
+
+VelocityLibrary
+
+ A collection of general purpose view tools. See
+ library/REAMDE.txt for more information.
+
+VelocityStruts
+
+ Tools specific to integrating Velocity and Struts. See
+ struts/README.txt for more information. There are several
+ nice application examples included.
+
+
+
+
+Build Instructions
+------------------
+
+Building the project requires ant 1.4.1 or higher. To build the entire
+project, including the subprojects, documentation, examples, type:
+
+> ant
+
+To return to the original virgin state, type:
+
+> ant clean
-view : A general-purpose servlet for rendering Velocity templates.
- There is no controller functionality - it's akin to the
- JspServlet. It includes toolbox support. See view/README.txt
- for more information.
-
-struts : Tools specific to integrating Velocity and Struts. See
- struts/README.txt for more information. There are several
- nice application examples included.
-tools : A collection of general purpose view tools. See
- tools/REAMDE.txt for more information.
-
Documentation
-------------
-There is overview documentation and documentation for the different
-components. To build the documentation follow these steps:
+The project includes brief overview documentation and more detailed
+documentation for each subproject. Follow the 'Build Instructions' to
+build then project, then, point your browser at docs/index.html
-> ant docs
-> ant javadocs
-> ant javadocs-vellibrary
-> cd view
-> ant docs
-> ant javadocs-velservlet
-> cd ../struts
-> ant docs
-> cd ../tools
-> ant docs
+Feedback
+--------
-then, point your browser at docs/index.html
+We welcome your feedback to [EMAIL PROTECTED]
1.4 +31 -3 jakarta-velocity-tools/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 15 Apr 2002 18:30:27 -0000 1.3
+++ build.xml 16 Apr 2002 14:09:06 -0000 1.4
@@ -88,24 +88,52 @@
<!-- C L E A N -->
<!-- ================================================================== -->
<target name="clean"
- description="Clean build and distribution directories">
+ description="Clean build and distribution directories">
+
<delete>
<fileset dir="${docs.dest}" includes="**/*.html"/>
</delete>
+
<delete dir="${docs.dest}/javadoc"/>
+
<delete dir="${docs.dest}/javadoc-vellibrary"/>
+
<delete>
<fileset dir="${basedir}" includes="**/*.bak"/>
</delete>
+ <!-- Clean subprojects-->
+
+ <ant dir="view" target="clean" inheritAll="false"/>
+
+ <ant dir="tools" target="clean" inheritAll="false"/>
+
+ <ant dir="struts" target="clean" inheritAll="false"/>
+
+ <ant dir="struts/examples/struts" target="clean" inheritAll="false"/>
+
</target>
<!-- ================================================================== -->
<!-- A L L -->
<!-- ================================================================== -->
- <target name="all" depends="clean, docs,javadocs"
- description="Clean and compile all components"/>
+ <target name="all" depends="clean,docs,javadocs,javadocs-vellibrary"
+ description="Build entire project, including all subprojects">
+
+ <!-- Build view package -->
+ <ant dir="view" target="all" inheritAll="false"/>
+
+ <!-- Build library package -->
+ <ant dir="tools" target="all" inheritAll="false"/>
+
+ <!-- Build struts package -->
+ <ant dir="struts" target="all" inheritAll="false"/>
+
+ <!-- Build VelocityStruts examples -->
+ <ant dir="struts/examples/struts" target="all" inheritAll="false"/>
+
+ </target>
1.7 +57 -37 jakarta-velocity-tools/struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/struts/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 15 Apr 2002 10:41:36 -0000 1.6
+++ build.xml 16 Apr 2002 14:09:06 -0000 1.7
@@ -3,15 +3,15 @@
<!-- ========== Initialize Properties ===================================== -->
- <property file="build/build.properties"/> <!-- Component local -->
- <property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/.build.properties"/> <!-- User local -->
+ <property file="${basedir}/build/build.properties"/> <!-- Component local -->
+ <property file="${basedir}/../build.properties"/> <!-- Commons local -->
+ <property file="${user.home}/.build.properties"/> <!-- User local -->
<!-- ========== External Dependencies ===================================== -->
<!-- the local repository -->
- <property name="local.repository" value="./lib" />
- <property name="project.repository" value="../lib" />
+ <property name="local.repository" value="${basedir}/lib" />
+ <property name="project.repository" value="${basedir}/../lib" />
<!-- ========== Component Declarations ==================================== -->
@@ -29,25 +29,25 @@
<property name="project.date" value="29-Mar-2002"/>
<!-- The base directory for compilation targets -->
- <property name="build.home" value="target"/>
+ <property name="build.home" value="${basedir}/target"/>
<!-- The base directory for distribution targets -->
- <property name="dist.home" value="dist"/>
+ <property name="dist.home" value="${basedir}/dist"/>
<!-- The base directory for component sources -->
- <property name="source.home" value="src"/>
+ <property name="source.home" value="${basedir}/src"/>
<!-- The base directory for component sources -->
- <property name="conf.home" value="src/conf"/>
+ <property name="conf.home" value="${basedir}/src/conf"/>
<!-- The docs source directory -->
- <property name="docs.src" value="xdocs"/>
+ <property name="docs.src" value="${basedir}/xdocs"/>
<!-- The docs destination directory -->
- <property name="docs.dest" value="docs"/>
+ <property name="docs.dest" value="${basedir}/docs"/>
<!-- The docs destination directory -->
- <property name="examples.home" value="examples"/>
+ <property name="examples.home" value="${basedir}/examples"/>
<!-- ========== Compiler Defaults ========================================= -->
@@ -130,34 +130,48 @@
<!-- C L E A N -->
<!-- ================================================================== -->
<target name="clean"
- description="Clean build and distribution directories">
+ description="Clean build and distribution directories">
+
<delete dir="${build.home}"/>
+
<delete dir="${dist.home}"/>
+
<delete>
<fileset dir="${basedir}" includes="*.jar"/>
</delete>
+
<delete>
<fileset dir="${docs.dest}" includes="**/*.html"/>
</delete>
+
+ <delete>
+ <fileset dir="${project.repository}" includes="${project.name}-*.jar"/>
+ </delete>
+
<delete dir="${examples.home}/velstruts"/>
+
<delete dir="${examples.home}/struts/doc/javadoc"/>
+
<delete>
- <fileset dir="${examples.home}/struts/WEB-INF/lib"
includes="${project.name}-*.jar"/>
+ <fileset dir="${examples.home}/struts/WEB-INF/lib"
includes="$velocity-tools-*.jar"/>
</delete>
+
<delete>
<fileset dir="${examples.home}" includes="*.war"/>
</delete>
+
<delete>
<fileset dir="${basedir}" includes="**/*.bak"/>
</delete>
+
</target>
<!-- ================================================================== -->
<!-- A L L -->
<!-- ================================================================== -->
- <target name="all" depends="clean,jar,docs,javadocs,examples"
- description="Clean and compile all components"/>
+ <target name="all" depends="clean,jar,install-jar,docs,javadocs,examples"
+ description="Build entire project"/>
<!-- ================================================================== -->
@@ -209,12 +223,13 @@
<dvsl
basedir="${docs.src}"
destdir="${docs.dest}/"
- toolboxfile="../xdocs/toolbox.props"
+ toolboxfile="${basedir}/../xdocs/toolbox.props"
extension=".html"
- style="../xdocs/site.dvsl"
+ style="${basedir}/../xdocs/site.dvsl"
excludes="*menue.xml"
- includes="**/*.xml"
- />
+ includes="**/*.xml">
+ <tool name="toolbox.string.basedir" value="${basedir}" />
+ </dvsl>
<replace dir="${docs.dest}">
<replacefilter token="@@@version@@@" value="${project.version}"/>
@@ -229,7 +244,7 @@
<!-- ================================================================== -->
<!-- E X A M P L E S -->
<!-- ================================================================== -->
- <target name="examples" depends="clean,jar,docs,javadocs"
+ <target name="examples" depends="clean,install-jar,docs,javadocs"
description="Setup example application">
<!-- Setup example applications -->
@@ -241,11 +256,12 @@
<!-- Deploy jar -->
<delete>
- <fileset dir="${examples.home}/struts/WEB-INF/lib"
includes="${project.name}-*.jar"/>
+ <fileset dir="${examples.home}/struts/WEB-INF/lib"
includes="velocity-tools-*.jar"/>
</delete>
+
<copy todir="${examples.home}/struts/WEB-INF/lib" filtering="no">
- <fileset dir="${basedir}">
- <include name="${project.name}-*.jar"/>
+ <fileset dir="${project.repository}">
+ <include name="velocity-tools-*.jar"/>
</fileset>
</copy>
@@ -254,7 +270,8 @@
<fileset dir="${build.home}/javadoc"/>
</copy>
-<!-- Copy reference documentation
+<!-- Fix problems with relative links first
+ Copy reference documentation
<copy todir="${examples.home}/struts/doc/">
<fileset dir="${docs.dest}" includes="*.html"/>
</copy>
@@ -309,18 +326,6 @@
</target>
- <!-- ================================================================== -->
- <!-- I N S T A L L J A R -->
- <!-- ================================================================== -->
- <target name="install-jar" depends="jar"
- description="Installs .jar file in ${lib.repo}">
- <copy todir="${lib.repo}" filtering="no">
- <fileset dir="${basedir}">
- <include name="${project.name}-${project.version}.jar"/>
- </fileset>
- </copy>
- </target>
-
<!-- ================================================================== -->
<!-- D E P L O Y J A R -->
@@ -339,6 +344,21 @@
</copy>
</target>
+
+ <!-- ================================================================== -->
+ <!-- I N S T A L L J A R -->
+ <!-- ================================================================== -->
+ <target name="install-jar" depends="jar"
+ description="--> Installs .jar file in ${project.repository}">
+
+ <copy todir="${project.repository}" filtering="no">
+ <fileset dir="${basedir}">
+ <include name="${project.name}-${project.version}.jar"/>
+ </fileset>
+ </copy>
+
+ </target>
+
</project>
1.8 +24 -17 jakarta-velocity-tools/struts/examples/struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/struts/examples/struts/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 4 Apr 2002 09:18:55 -0000 1.7
+++ build.xml 16 Apr 2002 14:09:07 -0000 1.8
@@ -1,19 +1,21 @@
-<project name="velocity-view" default="jar" basedir=".">
+<project name="velocity-view" default="all" basedir=".">
<!-- ========== Initialize Properties ===================================== -->
- <property file="build/build.properties"/> <!-- Component local -->
- <property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/.build.properties"/> <!-- User local -->
+ <property file="${basedir}/build/build.properties"/> <!-- Component local -->
+ <property file="${basedir}/../build.properties"/> <!-- Commons local -->
+ <property file="${user.home}/.build.properties"/> <!-- User local -->
+
+
<!-- ========== External Dependencies ===================================== -->
<!-- the local repository -->
- <property name="local.repository" value="WEB-INF/lib" />
- <property name="project.repository" value="WEB-INF/build-lib" />
+ <property name="local.repository" value="${basedir}/WEB-INF/lib" />
+ <property name="project.repository" value="${basedir}/WEB-INF/build-lib"
/>
-<!-- ========== Component Declarations ==================================== -->
+<!-- ========== Component Declarations ==================================== -->
<!-- The name of this component -->
<property name="project.name" value="VelocityStruts Example" />
@@ -22,27 +24,26 @@
<property name="project.title" value="VelocityStruts Example"/>
<!-- The base directory for compilation targets -->
- <property name="build.home" value="WEB-INF"/>
+ <property name="build.home" value="${basedir}/WEB-INF"/>
<!-- The base directory for distribution targets -->
- <property name="dist.home" value="dist"/>
+ <property name="dist.home" value="${basedir}/dist"/>
<!-- The base directory for component sources -->
- <property name="source.home" value="WEB-INF/src"/>
+ <property name="source.home" value="${basedir}/WEB-INF/src"/>
<!-- The base directory for component sources -->
- <property name="conf.home" value="src/conf"/>
+ <property name="conf.home" value="${basedir}/src/conf"/>
<!-- The docs source directory -->
- <property name="docs.src" value="xdocs"/>
+ <property name="docs.src" value="${basedir}/xdocs"/>
<!-- The docs destination directory -->
- <property name="docs.dest" value="doc"/>
+ <property name="docs.dest" value="${basedir}/doc"/>
<!-- ========== Compiler Defaults ========================================= -->
-
<!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/>
@@ -62,8 +63,8 @@
</fileset>
</path>
-<!-- ========== Executable Targets ======================================== -->
+<!-- ========== Executable Targets ======================================== -->
<!-- ================================================================== -->
<!-- I N I T -->
@@ -76,6 +77,13 @@
<!-- ================================================================== -->
+ <!-- A L L -->
+ <!-- ================================================================== -->
+ <target name="all" depends="clean,init,compile,war"
+ description="Build entire example"/>
+
+
+ <!-- ================================================================== -->
<!-- C O M P I L E -->
<!-- ================================================================== -->
<target name="compile" depends="init" description="Compile">
@@ -98,7 +106,7 @@
<!-- ================================================================== -->
<!-- C L E A N -->
<!-- ================================================================== -->
- <target name="clean" depends="init"
+ <target name="clean" depends=""
description="Clean build and distribution directories">
<!-- remove old class files -->
@@ -125,7 +133,6 @@
<!-- Generate .war file, name it velstruts.war -->
<jar jarfile="${basedir}/../velstruts.war" basedir="${basedir}"/>
</target>
-
</project>
1.3 +34 -39 jakarta-velocity-tools/tools/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/tools/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 15 Apr 2002 09:43:12 -0000 1.2
+++ build.xml 16 Apr 2002 14:09:07 -0000 1.3
@@ -3,15 +3,15 @@
<!-- ========== Initialize Properties ===================================== -->
- <property file="build/build.properties"/> <!-- Component local -->
- <property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/.build.properties"/> <!-- User local -->
+ <property file="${basedir}/build/build.properties"/> <!-- Component local -->
+ <property file="${basedir}/../build.properties"/> <!-- Commons local -->
+ <property file="${user.home}/.build.properties"/> <!-- User local -->
<!-- ========== External Dependencies ===================================== -->
<!-- the local repository -->
- <property name="local.repository" value="./lib" />
- <property name="project.repository" value="../lib" />
+ <property name="local.repository" value="${basedir}/lib" />
+ <property name="project.repository" value="${basedir}/../lib" />
<!-- ========== Component Declarations ==================================== -->
@@ -29,25 +29,25 @@
<property name="project.date" value="24-Mar-2002"/>
<!-- The base directory for compilation targets -->
- <property name="build.home" value="target"/>
+ <property name="build.home" value="${basedir}/target"/>
<!-- The base directory for distribution targets -->
- <property name="dist.home" value="dist"/>
+ <property name="dist.home" value="${basedir}/dist"/>
<!-- The base directory for component sources -->
- <property name="source.home" value="src"/>
+ <property name="source.home" value="${basedir}/src"/>
<!-- The base directory for component sources -->
- <property name="conf.home" value="src/conf"/>
+ <property name="conf.home" value="${basedir}/src/conf"/>
<!-- The docs source directory -->
- <property name="docs.src" value="xdocs"/>
+ <property name="docs.src" value="${basedir}/xdocs"/>
<!-- The docs destination directory -->
- <property name="docs.dest" value="docs"/>
+ <property name="docs.dest" value="${basedir}/docs"/>
<!-- The docs destination directory -->
- <property name="examples.home" value="examples"/>
+ <property name="examples.home" value="${basedir}/examples"/>
<!-- ========== Compiler Defaults ========================================= -->
@@ -129,15 +129,24 @@
<!-- C L E A N -->
<!-- ================================================================== -->
<target name="clean"
- description="Clean build and distribution directories">
+ description="Clean build and distribution directories">
+
<delete dir="${build.home}"/>
+
<delete dir="${dist.home}"/>
+
<delete>
<fileset dir="${basedir}" includes="*.jar"/>
</delete>
+
+ <delete>
+ <fileset dir="${project.repository}" includes="${project.name}-*.jar"/>
+ </delete>
+
<delete>
<fileset dir="${docs.dest}" includes="**/*.html"/>
</delete>
+
<delete>
<fileset dir="${basedir}" includes="**/*.bak"/>
</delete>
@@ -148,8 +157,8 @@
<!-- ================================================================== -->
<!-- A L L -->
<!-- ================================================================== -->
- <target name="all" depends="clean,jar,docs,javadocs"
- description="Clean and compile all components"/>
+ <target name="all" depends="clean,jar,install-jar,docs,javadocs"
+ description="Build entire project"/>
<!-- ================================================================== -->
@@ -157,9 +166,10 @@
<!-- ================================================================== -->
<target name="javadocs" depends="compile"
description="Create Javadoc documentation">
+
<javadoc sourcepath="${source.home}/java"
destdir="${build.home}/javadoc"
- packagenames="org.apache.velocity.tools.struts.*"
+ packagenames="org.apache.velocity.tools.tools.*"
author="true"
private="true"
version="true"
@@ -199,12 +209,13 @@
<dvsl
basedir="${docs.src}"
destdir="${docs.dest}/"
- toolboxfile="../xdocs/toolbox.props"
+ toolboxfile="${basedir}/../xdocs/toolbox.props"
extension=".html"
- style="../xdocs/site.dvsl"
+ style="${basedir}/../xdocs/site.dvsl"
excludes="*menue.xml"
- includes="**/*.xml"
- />
+ includes="**/*.xml">
+ <tool name="toolbox.string.basedir" value="${basedir}" />
+ </dvsl>
<replace dir="${docs.dest}">
<replacefilter token="@@@version@@@" value="${project.version}"/>
@@ -219,30 +230,14 @@
<!-- I N S T A L L J A R -->
<!-- ================================================================== -->
<target name="install-jar" depends="jar"
- description="--> Installs .jar file in ${lib.repo}">
- <copy todir="${lib.repo}" filtering="no">
+ description="--> Installs .jar file in ${project.repository}">
+
+ <copy todir="${project.repository}" filtering="no">
<fileset dir="${basedir}">
<include name="${project.name}-${project.version}.jar"/>
</fileset>
</copy>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- D E P L O Y J A R -->
- <!-- ================================================================== -->
- <target name="deploy-jar" depends="compile, jar"
- description="Deploy jar to example applications">
-
- <delete>
- <fileset dir="${examples.home}/struts/WEB-INF/lib"
includes="${project.name}-*.jar"/>
- </delete>
- <copy todir="${examples.home}/struts/WEB-INF/lib" filtering="no">
- <fileset dir="${basedir}">
- <include name="${project.name}-*.jar"/>
- </fileset>
- </copy>
</target>
1.9 +40 -24 jakarta-velocity-tools/view/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/view/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 15 Apr 2002 10:40:57 -0000 1.8
+++ build.xml 16 Apr 2002 14:09:07 -0000 1.9
@@ -1,19 +1,20 @@
-<project name="velocity-tools-view" default="jar" basedir=".">
+<project name="velocity-tools-view" default="all" basedir=".">
<!-- ========== Initialize Properties ===================================== -->
- <property file="build/build.properties"/> <!-- Component local -->
- <property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/.build.properties"/> <!-- User local -->
+ <property file="${basedir}/build/build.properties"/> <!-- Component local -->
+ <property file="${basedir}/../build.properties"/> <!-- Commons local -->
+ <property file="${user.home}/.build.properties"/> <!-- User local -->
+
<!-- ========== External Dependencies ===================================== -->
<!-- the local repository -->
- <property name="local.repository" value="./lib" />
- <property name="project.repository" value="../lib" />
+ <property name="local.repository" value="${basedir}/lib" />
+ <property name="project.repository" value="${basedir}/../lib" />
-<!-- ========== Component Declarations ==================================== -->
+<!-- ========== Component Declarations ==================================== -->
<!-- The name of this component -->
<property name="project.name" value="velocity-tools-view" />
@@ -25,25 +26,25 @@
<property name="project.version" value="0.6"/>
<!-- The base directory for compilation targets -->
- <property name="build.home" value="target"/>
+ <property name="build.home" value="${basedir}/target"/>
<!-- The base directory for distribution targets -->
- <property name="dist.home" value="dist"/>
+ <property name="dist.home" value="${basedir}/dist"/>
<!-- The base directory for component sources -->
- <property name="source.home" value="src"/>
+ <property name="source.home" value="${basedir}/src"/>
<!-- The base directory for component sources -->
- <property name="conf.home" value="src/conf"/>
+ <property name="conf.home" value="${basedir}/src/conf"/>
<!-- The docs source directory -->
- <property name="docs.src" value="xdocs"/>
+ <property name="docs.src" value="${basedir}/xdocs"/>
<!-- The docs destination directory -->
- <property name="docs.dest" value="docs"/>
+ <property name="docs.dest" value="${basedir}/docs"/>
-<!-- ========== Compiler Defaults ========================================= -->
+<!-- ========== Compiler Defaults ========================================= -->
<!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/>
@@ -64,8 +65,8 @@
</fileset>
</path>
-<!-- ========== Executable Targets ======================================== -->
+<!-- ========== Executable Targets ======================================== -->
<!-- ================================================================== -->
<!-- I N I T -->
@@ -125,16 +126,26 @@
<!-- C L E A N -->
<!-- ================================================================== -->
<target name="clean"
- description="Clean build and distribution directories">
+ description="Clean build and distribution directories">
+
<delete dir="${build.home}"/>
+
<delete dir="${dist.home}"/>
+
<delete>
<fileset dir="${docs.dest}" includes="**/*"/>
</delete>
+
<delete dir="${docs.dest}/javadoc-velservlet"/>
+
<delete>
<fileset dir="${basedir}" includes="*.jar"/>
</delete>
+
+ <delete>
+ <fileset dir="${project.repository}" includes="${project.name}-*.jar"/>
+ </delete>
+
<delete>
<fileset dir="${basedir}" includes="**/*.bak"/>
</delete>
@@ -145,8 +156,8 @@
<!-- ================================================================== -->
<!-- A L L -->
<!-- ================================================================== -->
- <target name="all" depends="clean,jar, docs, javadocs"
- description="Clean and compile all components"/>
+ <target name="all" depends="clean,jar,install-jar,docs,javadocs"
+ description="Build entire project"/>
<!-- ================================================================== -->
@@ -226,12 +237,14 @@
<dvsl
basedir="${docs.src}"
destdir="${docs.dest}/"
- toolboxfile="../xdocs/toolbox.props"
+ toolboxfile="${basedir}/../xdocs/toolbox.props"
extension=".html"
- style="../xdocs/site.dvsl"
+ style="${basedir}/../xdocs/site.dvsl"
excludes="**/*menue.xml"
- includes="**/*.xml"
- />
+ includes="**/*.xml">
+ <tool name="toolbox.string.basedir" value="${basedir}" />
+ </dvsl>
+
</target>
@@ -239,13 +252,16 @@
<!-- I N S T A L L J A R -->
<!-- ================================================================== -->
<target name="install-jar" depends="jar"
- description="Installs .jar file in ${lib.repo}">
- <copy todir="${lib.repo}" filtering="no">
+ description="Installs .jar file in ${project.repository}">
+
+ <copy todir="${project.repository}" filtering="no">
<fileset dir="${basedir}">
<include name="${project.name}-${project.version}.jar"/>
</fileset>
</copy>
+
</target>
+
</project>
1.5 +6 -1 jakarta-velocity-tools/xdocs/site.dvsl
Index: site.dvsl
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/xdocs/site.dvsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- site.dvsl 15 Apr 2002 18:30:30 -0000 1.4
+++ site.dvsl 16 Apr 2002 14:09:07 -0000 1.5
@@ -16,7 +16,11 @@
#match( "document" )
#set( $document = $node )
- #set( $projectfile = $node.properties.projectfile )
+ #if ($context.toolbox.basedir)
+ #set( $projectfile = "$context.toolbox.basedir/$node.properties.projectfile" )
+ #else
+ #set( $projectfile = $node.properties.projectfile )
+ #end
#set( $project = $node.selectSingleNode("document('$projectfile')/project" ) )
<html>
@@ -27,6 +31,7 @@
<meta name="author" value="$n"/>
<meta name="email" value="$n.attribute("email")" />
#end
+
</head>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
