craigmcc 01/04/30 11:42:45
Modified: dbcp .cvsignore build.xml
Log:
Update to new distribution directory guidelines.
Revision Changes Path
1.2 +2 -2 jakarta-commons/dbcp/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2001/04/14 17:15:05 1.1
+++ .cvsignore 2001/04/30 18:42:40 1.2
@@ -1,2 +1,2 @@
-build
-build.properties
\ No newline at end of file
+build.properties
+dist
1.3 +11 -6 jakarta-commons/dbcp/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/04/22 17:05:06 1.2
+++ build.xml 2001/04/30 18:42:41 1.3
@@ -1,4 +1,4 @@
-<!-- $Id: build.xml,v 1.2 2001/04/22 17:05:06 rwaldhoff Exp $ -->
+<!-- $Id: build.xml,v 1.3 2001/04/30 18:42:41 craigmcc Exp $ -->
<project name="jakarta-commons-dbcp" default="test" basedir=".">
<!-- patternset describing files to be copied from the doc directory -->
@@ -58,9 +58,9 @@
<property name="source.src.java" value="${source.src}/java"/>
<property name="source.src.test" value="${source.src}/test"/>
<property name="source.doc" value="${basedir}/doc"/>
- <property name="dest" value="${basedir}/build"/>
+ <property name="dest" value="${basedir}/dist"/>
<property name="dest.classes" value="${dest}/classes"/>
- <property name="dest.doc" value="${dest}/doc"/>
+ <property name="dest.doc" value="${dest}/docs"/>
<property name="dest.doc.api" value="${dest.doc}/api"/>
<property name="dest.jardir" value="${dest}"/>
<property name="dest.jardir.jar" value="${dest.jardir}/${name}.jar"/>
@@ -93,7 +93,7 @@
<!-- ######################################################### -->
- <target name="clean" depends="init,clean-doc,clean-build,clean-dist"
description="removes generated files">
+ <target name="clean" depends="init" description="removes generated files">
<delete dir="${dest}"/>
</target>
@@ -115,9 +115,14 @@
<!-- ######################################################### -->
- <target name="doc" depends="init,doc-copy,doc-javadoc" description="generates
javadocs and other documentation">
+ <target name="doc" depends="init,doc-top,doc-copy,doc-javadoc"
description="generates javadocs and other documentation">
</target>
+ <target name="doc-top" depends="init">
+ <mkdir dir="${dest}"/>
+ <copy todir="${dest}" file="../LICENSE"/>
+ </target>
+
<target name="doc-copy" depends="init" if="available-doc">
<mkdir dir="${dest.doc}"/>
<copy todir="${dest.doc}">
@@ -209,7 +214,7 @@
<!-- ######################################################### -->
- <target name="dist" depends="dist-jar" description="builds production jar"/>
+ <target name="dist" depends="dist-jar,doc" description="builds binary
distribution"/>
<target name="dist-jar" depends="build">
<mkdir dir="${dest.jardir}"/>
