geirm 02/02/21 22:17:55
Modified: . build.xml
Log:
Patch from Bill Burton <[EMAIL PROTECTED]> + a version update
Revision Changes Path
1.15 +38 -45 jakarta-velocity-dvsl/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-dvsl/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 20 Feb 2002 05:25:35 -0000 1.14
+++ build.xml 22 Feb 2002 06:17:55 -0000 1.15
@@ -18,10 +18,10 @@
<property name="project.name" value="velocity-dvsl" />
<!-- The title of this component -->
- <property name="project.title" value=""/>
+ <property name="project.title" value="DVSL"/>
<!-- The current version number of this component -->
- <property name="project.version" value="0.41"/>
+ <property name="project.version" value="0.42"/>
<!-- The base directory for compilation targets -->
<property name="build.home" value="target"/>
@@ -44,6 +44,13 @@
<!-- The printdocs destination directory -->
<property name="docs-printable.dest" value="docs_print"/>
+ <!-- Name of generated dvsl.jar file -->
+ <property name="dvsl.jar"
+ value="${project.name}-${project.version}.jar" />
+
+ <!-- Location of ant.jar -->
+ <property name="ant.jar" value="${ant.home}/lib/ant.jar" />
+
<!-- ========== Compiler Defaults ========================================= -->
@@ -63,6 +70,7 @@
<fileset dir="${local.repository}">
<include name="**/*.jar"/>
</fileset>
+ <pathelement location="${ant.jar}"/>
</path>
@@ -89,8 +97,7 @@
<!-- ================================================================== -->
<!-- I N I T -->
<!-- ================================================================== -->
- <target name="init"
- description="Initialize and evaluate conditionals">
+ <target name="init">
<echo message="-------- ${project.name} ${project.version} --------"/>
<filter token="name" value="${project.name}"/>
<filter token="version" value="${project.version}"/>
@@ -99,8 +106,7 @@
<!-- ================================================================== -->
<!-- P R E P A R E -->
<!-- ================================================================== -->
- <target name="prepare" depends="init"
- description="Prepare build directory">
+ <target name="prepare" depends="init">
<mkdir dir="${build.home}"/>
<mkdir dir="${build.home}/classes"/>
<mkdir dir="${build.home}/conf"/>
@@ -111,8 +117,7 @@
<!-- ================================================================== -->
<!-- S T A T I C -->
<!-- ================================================================== -->
- <target name="static" depends="prepare"
- description="Copy static files to build directory">
+ <target name="static" depends="prepare">
<tstamp/>
<copy todir="${build.home}/conf" filtering="on">
<fileset dir="${conf.home}" includes="*.MF"/>
@@ -148,7 +153,8 @@
<!-- ================================================================== -->
<!-- C O M P I L E - T E S T -->
<!-- ================================================================== -->
- <target name="compile-tests" depends="compile" description="Compile Testcases">
+ <target name="compile-tests" depends="compile"
+ description="Compile Testcases">
<javac srcdir="${source.home}/test"
destdir="${build.home}/tests"
@@ -170,7 +176,9 @@
<target name="clean"
description="Clean build and distribution directories">
<delete dir="${build.home}"/>
+ <delete file="${dvsl.jar}"/>
<delete dir="${dist.home}"/>
+ <delete dir="${docs-printable.dest}"/>
</target>
<!-- ================================================================== -->
@@ -192,7 +200,7 @@
version="true"
doctitle="<h1>${project.title}</h1>"
windowtitle="${project.title} (Version ${project.version})"
- bottom="Copyright (c) 2001 Apache Software Foundation" >
+ bottom="Copyright (c) 2001-2002 Apache Software Foundation" >
<classpath refid="classpath"/>
@@ -202,8 +210,9 @@
<!-- ================================================================== -->
<!-- J A R -->
<!-- ================================================================== -->
- <target name="jar" depends="compile">
- <jar jarfile="${project.name}-${project.version}.jar"
+ <target name="jar" depends="compile"
+ description="Creates jar file">
+ <jar jarfile="${dvsl.jar}"
basedir="${build.home}/classes"
manifest="${conf.home}/MANIFEST.MF"/>
</target>
@@ -212,10 +221,10 @@
<!-- I N S T A L L J A R -->
<!-- ================================================================== -->
<target name="install-jar" depends="jar"
- description="--> Installs .jar file in ${lib.repo}">
+ description="Installs .jar file in ${lib.repo}">
<copy todir="${lib.repo}" filtering="no">
<fileset dir="${basedir}">
- <include name="${project.name}-${project.version}.jar"/>
+ <include name="${dvsl.jar}"/>
</fileset>
</copy>
</target>
@@ -223,20 +232,12 @@
<!-- ================================================================== -->
<!-- D O C S -->
<!-- ================================================================== -->
- <target name="docs">
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
-
- <classpath>
- <pathelement location="${project.name}-${project.version}.jar"/>
- <path refid="classpath"/>
- </classpath>
-
- </taskdef>
-
+ <target name="docs" depends="docs-init"
+ description="Generate documentation">
<dvsl
basedir="${docs.src}"
destdir="${docs.dest}/"
- toolbox="${docs.src}/toolbox.props"
+ toolboxfile="${docs.src}/toolbox.props"
extension=".html"
style="${source.home}/stylesheets/site.dvsl"
excludes="**/project.xml"
@@ -244,34 +245,26 @@
/>
</target>
- <!-- Is the directory for printable docs already created?-->
- <target name="docsprint-dir-check">
- <available file="${docs-printable.dest}" type="file"
property="docsprint-dir.present"/>
- </target>
-
- <target name="docsprint-dir-create" depends="docsprint-dir-check"
unless="docsprint-dir.present">
- <mkdir dir="${docs-printable.dest}"/>
- </target>
-
-<target name="docs-printable" depends="docsprint-dir-create">
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
-
- <classpath>
- <pathelement location="${project.name}-${project.version}.jar"/>
- <path refid="classpath"/>
- </classpath>
-
- </taskdef>
-
+ <target name="docs-printable" depends="docs-init"
+ description="Generate printable documentation">
<dvsl
basedir="${docs.src}"
destdir="${docs-printable.dest}/"
- toolbox="${docs.src}/toolbox.props"
+ toolboxfile="${docs.src}/toolbox.props"
extension=".html"
style="${source.home}/stylesheets/site_printable.dvsl"
excludes="**/project.xml"
includes="**/*.xml"
/>
+ </target>
+
+ <target name="docs-init">
+ <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
+ <classpath>
+ <pathelement location="${dvsl.jar}"/>
+ <path refid="classpath"/>
+ </classpath>
+ </taskdef>
</target>
<!-- ================================================================== -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
