donaldp 01/11/10 02:32:11
Modified: . build.xml
Log:
Add a changelog target based on Alexandrias task.
Remove tools/** and build.sh/build.bat from the distributions.
Revision Changes Path
1.72 +21 -28 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- build.xml 2001/11/10 07:07:47 1.71
+++ build.xml 2001/11/10 10:32:10 1.72
@@ -69,7 +69,7 @@
<property name="src.dist.dir" value="${dist.name}"/>
<property name="constants.file"
value="org/apache/avalon/phoenix/Constants.java"/>
- <property name="xerces.jar" value="lib/xerces.jar"/>
+ <property name="xerces.jar" value="${lib.dir}/xerces.jar"/>
<property name="xalan.jar" value="${tools.dir}/lib/xalan-2.2.0-D8.jar"/>
<property name="framework.jar"
value="${lib.dir}/avalon-framework-20011110.jar"/>
<property name="excalibur.jar"
value="${lib.dir}/avalon-excalibur-20011110.jar"/>
@@ -170,6 +170,23 @@
</target>
<!-- Create the announcements and HEADER.html -->
+ <target name="changelog" depends="setup-filters">
+
+ <taskdef name="clog" classname="org.apache.tools.ant.taskdefs.ChangeLog">
+ <classpath refid="tools.class.path"/>
+ </taskdef>
+
+ <!-- Build change log -->
+ <clog basedir="." output="ChangeLog"
userlist="${tools.dir}/Users.properties" />
+
+ <style in="ChangeLog" style="${tools.dir}/changelog.xsl"
out="ChangeLog.html">
+ <param name="module" expression="'jakarta-avalon-phoenix'"/>
+ <param name="cvsweb" expression="'http://cvs.apache.org/viewcvs.cgi'"/>
+ </style>
+
+ </target>
+
+ <!-- Create the announcements and HEADER.html -->
<target name="announcement" depends="setup-filters">
<mkdir dir="${build.dir}" />
@@ -237,7 +254,7 @@
</target>
<!-- Create the API documentation -->
- <target name="javadocs" description="generates the API documentation (java
1.2+ only)">
+ <target name="javadocs" description="generates the API documentation">
<delete dir="${build.javadocs}"/>
<mkdir dir="${build.javadocs}"/>
@@ -451,7 +468,7 @@
</target>
<!-- Create the distribution -->
- <target name="bin-dist" depends="all">
+ <target name="bin-dist" depends="all,setup-filters">
<property name="bin.dist.docs" value="${bin.dist.dir}/docs"/>
<property name="bin.dist.javadocs" value="${bin.dist.dir}/docs/api"/>
@@ -480,7 +497,7 @@
</target>
<!-- Create the source distribution -->
- <target name="src-dist">
+ <target name="src-dist" depends="setup-filters">
<property name="src.dist.src" value="${src.dist.dir}/src"/>
<property name="src.dist.docs" value="${src.dist.dir}/docs"/>
@@ -492,10 +509,6 @@
<mkdir dir="${src.dist.docs}"/>
<mkdir dir="${src.dist.javadocs}"/>
- <copy todir="${src.dist.tools}">
- <fileset dir="${tools.dir}"/>
- </copy>
-
<copy file="${xerces.jar}" todir="${src.dist.lib}/"/>
<copy file="${framework.jar}" todir="${src.dist.lib}"/>
<copy file="${excalibur.jar}" todir="${src.dist.lib}"/>
@@ -520,27 +533,11 @@
<include name="WARNING"/>
<include name="LICENSE"/>
<include name="BUILDING.txt"/>
- <include name="build.bat"/>
- <include name="build.sh"/>
<include name="build.xml"/>
</fileset>
</copy>
- <fixcrlf srcdir="${src.dist.dir}" includes="build.sh" eol="lf"/>
- <fixcrlf srcdir="${src.dist.dir}" includes="build.bat" eol="crlf"/>
- <fixcrlf srcdir="${src.dist.tools}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${src.dist.tools}/bin" includes="ant" eol="lf"/>
- <fixcrlf srcdir="${src.dist.tools}/bin" includes="antRun" eol="lf"/>
- <fixcrlf srcdir="${src.dist.tools}/bin" includes="*.bat" eol="crlf"/>
-
- <chmod perm="+x">
- <fileset dir="${src.dist.dir}">
- <include name="build.sh" />
- </fileset>
- </chmod>
-
<fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
-
<chmod dir="${src.dist.dir}" perm="go-rwx" />
</target>
@@ -582,12 +579,8 @@
includes="${dist.name}/**"/>
<tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar" >
- <tarfileset dir="${dist.name}/.." mode="755" username="avalon"
group="avalon">
- <include name="${dist.name}/build.sh"/>
- </tarfileset>
<tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
<include name="${dist.name}/**"/>
- <exclude name="${dist.name}/build.sh"/>
</tarfileset>
</tar>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
