You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gr...@apache.org on 2001/03/08 00:33:18 UTC
cvs commit: xml-cocoon/lib ant_1_3.jar ant_1_1.jar
greenrd 01/03/07 15:33:17
Modified: . build.xml changes.xml
Added: lib ant_1_3.jar
Removed: lib ant_1_1.jar
Log:
upgrading to ant 1.3
Revision Changes Path
1.69 +96 -44 xml-cocoon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/build.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- build.xml 2001/01/26 23:55:33 1.68
+++ build.xml 2001/03/07 23:33:11 1.69
@@ -225,31 +225,35 @@
<!-- Prepares the build directory -->
<!-- =================================================================== -->
<target name="prepare-projectx" depends="init" if="projectx.present">
- <copydir src="${src.dir}"
- dest="${build.src}"
- includes="**/parser/Sun*"
- filtering="on"/>
+ <copy todir="${build.src}" filtering="on">
+ <fileset dir="${src.dir}">
+ <include name="**/parser/Sun*"/>
+ </fileset>
+ </copy>
</target>
<target name="prepare-xt" depends="init" if="xt.present">
- <copydir src="${src.dir}"
- dest="${build.src}"
- includes="**/XT*"
- filtering="on"/>
+ <copy todir="${build.src}" filtering="on">
+ <fileset dir="${src.dir}">
+ <include name="**/XT*"/>
+ </fileset>
+ </copy>
</target>
<target name="prepare-saxon" depends="init" if="saxon.present">
- <copydir src="${src.dir}"
- dest="${build.src}"
- includes="**/SAXON*"
- filtering="on"/>
+ <copy todir="${build.src}" filtering="on">
+ <fileset dir="${src.dir}">
+ <include name="**/Saxon*"/>
+ </fileset>
+ </copy>
</target>
<target name="prepare-ldap" depends="init" if="jndi.present">
- <copydir src="${src.dir}"
- dest="${build.src}"
- includes="**/ldap/**"
- filtering="on"/>
+ <copy todir="${build.src}" filtering="on">
+ <fileset dir="${src.dir}">
+ <include name="**/ldap/**"/>
+ </fileset>
+ </copy>
</target>
<!-- =================================================================== -->
@@ -261,10 +265,14 @@
<mkdir dir="${build.dest}"/>
<!-- copy src files -->
- <copydir src="${src.dir}"
- dest="${build.src}"
- excludes="**/parser/Sun*, **/XT*, **/SAXON*, **/ldap/**"
- filtering="on"/>
+ <copy todir="${build.src}" filtering="on">
+ <fileset dir="${src.dir}">
+ <exclude name="**/parser/Sun*"/>
+ <exclude name="**/XT*"/>
+ <exclude name="**/SAXON*"/>
+ <exclude name="**/ldap/**"/>
+ </fileset>
+ </copy>
</target>
<!-- =================================================================== -->
@@ -292,14 +300,15 @@
<!-- Prepares the docs -->
<!-- =================================================================== -->
<target name="prepare-docs" depends="init">
- <copyfile src="changes.xml" dest="${docs.dir}/changes.xml" filtering="on"/>
- <copyfile src="todo.xml" dest="${docs.dir}/todo.xml"/>
+ <copy file="changes.xml" tofile="${docs.dir}/changes.xml" filtering="on"/>
+
+ <copy file="todo.xml" tofile="${docs.dir}/todo.xml"/>
<replace file="${docs.dir}/changes.xml" token="./xdocs/dtd/" value="dtd/"/>
<replace file="${docs.dir}/todo.xml" token="./xdocs/dtd/" value="dtd/"/>
<delete file="${docs.dir}/book.xml"/>
- <copyfile src="${docs.dir}/docs-book.xml" dest="${docs.dir}/book.xml" filtering="on"/>
+ <copy file="${docs.dir}/docs-book.xml" tofile="${docs.dir}/book.xml" filtering="on"/>
</target>
<!-- =================================================================== -->
@@ -307,8 +316,10 @@
<!-- =================================================================== -->
<target name="docs" depends="prepare-docs">
<mkdir dir="${build.docs}"/>
- <java fork="yes" classpath="${java.class.path}:${doc.generator.package}" classname="${doc.generator}"
- args="targetDirectory=${build.docs} ${docs.dir}/book.xml ${browser.skin}"/>
+ <java fork="yes" classpath="${java.class.path}:${doc.generator.package}"
+ classname="${doc.generator}">
+ <arg line="targetDirectory=${build.docs} ${docs.dir}/book.xml ${browser.skin}"/>
+ </java>
</target>
<!-- =================================================================== -->
@@ -316,8 +327,10 @@
<!-- =================================================================== -->
<target name="printer-docs" depends="prepare-docs">
<mkdir dir="${build.docs.printer}"/>
- <java fork="yes" classpath="${java.class.path}:${doc.generator.package}" classname="${doc.generator}"
- args="targetDirectory=${build.docs.printer} ${docs.dir}/book.xml ${printer.skin}"/>
+ <java fork="yes" classpath="${java.class.path}:${doc.generator.package}"
+ classname="${doc.generator}">
+ <arg line="targetDirectory=${build.docs.printer} ${docs.dir}/book.xml ${printer.skin}"/>
+ </java>
</target>
<!-- =================================================================== -->
@@ -326,9 +339,11 @@
<target name="site" depends="prepare-docs">
<mkdir dir="${site}"/>
<delete file="${docs.dir}/book.xml"/>
- <copyfile src="${docs.dir}/site-book.xml" dest="${docs.dir}/book.xml" filtering="on"/>
- <java fork="yes" classpath="${java.class.path}:${doc.generator.package}" classname="${doc.generator}"
- args="targetDirectory=${site} ${docs.dir}/book.xml ${browser.skin}"/>
+ <copy file="${docs.dir}/site-book.xml" tofile="${docs.dir}/book.xml" filtering="on"/>
+ <java fork="yes" classpath="${java.class.path}:${doc.generator.package}"
+ classname="${doc.generator}">
+ <arg line="targetDirectory=${site} ${docs.dir}/book.xml ${browser.skin}"/>
+ </java>
</target>
<!-- =================================================================== -->
@@ -366,20 +381,57 @@
<mkdir dir="${dist.dir}/skins"/>
<mkdir dir="${dist.dir}/xdocs"/>
- <copydir src="${build.src}" dest="${dist.dir}/src" excludes="cocoon.properties"/>
- <copyfile src="${src.dir}/org/apache/cocoon/cocoon.properties" dest="${dist.dir}/conf/cocoon.properties"/>
- <copyfile src="${build.dir}/${name}.jar" dest="${dist.dir}/bin/${name}.jar"/>
- <copydir src="${build.docs}" dest="${dist.dir}/docs"/>
- <copydir src="${build.javadocs}" dest="${dist.dir}/docs/api"/>
- <copydir src="${samples.dir}" dest="${dist.dir}/samples" filtering="on"/>
- <copydir src="${build.docs.printer}" dest="${dist.dir}/docs/printer"/>
- <copydir src="${docs.dir}" dest="${dist.dir}/xdocs" excludes="book.xml, changes.xml, todo.xml"/>
- <copydir src="${docs.dir}" dest="${dist.dir}" includes="changes.xml, todo.xml"/>
- <copydir src="${skins.dir}" dest="${dist.dir}/skins"/>
- <copydir src="${lib.dir}" dest="${dist.dir}/lib"/>
-
- <copydir src="." dest="${dist.dir}" includes="README, INSTALLING, LICENSE, build.*,
-lcp.bat, index.html" filtering="on"/>
+ <copy todir="${dist.dir}/src">
+ <fileset dir="${build.src}">
+ <exclude name="cocoon.properties"/>
+ </fileset>
+ </copy>
+
+ <copy file="${src.dir}/org/apache/cocoon/cocoon.properties" tofile="${dist.dir}/conf/cocoon.properties"/>
+ <copy file="${build.dir}/${name}.jar" tofile="${dist.dir}/bin/${name}.jar"/>
+
+ <copy todir="${dist.dir}/docs">
+ <fileset dir="${build.docs}"/>
+ </copy>
+ <copy todir="${dist.dir}/docs/api">
+ <fileset dir="${build.javadocs}"/>
+ </copy>
+ <copy todir="${dist.dir}/samples" filtering="on">
+ <fileset dir="${samples.dir}"/>
+ </copy>
+ <copy todir="${dist.dir}/docs/printer">
+ <fileset dir="${build.docs.printer}"/>
+ </copy>
+ <copy todir="${dist.dir}/xdocs">
+ <fileset dir="${docs.dir}">
+ <exclude name="book.xml"/>
+ <exclude name="changes.xml"/>
+ <exclude name="todo.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${dist.dir}">
+ <fileset dir="${docs.dir}">
+ <include name="changes.xml"/>
+ <include name="todo.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${dist.dir}/skins">
+ <fileset dir="${skins.dir}"/>
+ </copy>
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="${lib.dir}"/>
+ </copy>
+
+ <copy todir="${dist.dir}" filtering="on">
+ <fileset dir="${basedir}">
+ <include name="README"/>
+ <include name="INSTALLING"/>
+ <include name="LICENSE"/>
+ <include name="build.*"/>
+ <include name="lcp.bat"/>
+ <include name="index.html"/>
+ </fileset>
+ </copy>
<chmod perm="+x" file="${dist.dir}/build.sh"/>
<fixcrlf srcdir="${dist.dir}" includes="build.sh" cr="remove"/>
1.216 +5 -1 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- changes.xml 2001/03/01 16:24:16 1.215
+++ changes.xml 2001/03/07 23:33:12 1.216
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.215 2001/03/01 16:24:16 greenrd Exp $
+ $Id: changes.xml,v 1.216 2001/03/07 23:33:12 greenrd Exp $
-->
<changes title="History of Changes">
@@ -18,6 +18,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="RDG" type="update" due-to="Phillipe Lavoie"
+ due-to-email="philippe.lavoie@cactus.ca">
+ Upgraded Ant from version 1.1 to version 1.3 and rewrote build.xml to use new syntax.
+ </action>
<action dev="RDG" type="add" due-to="Donald Ball" due-to-email="balld@webslingerZ.com">
Added "fastcutoff" setting to cocoon.properties to control sendRedirect,
getOutputStream and getWriter behaviour for maximum flexibility and backward compatibility.
1.2 +1185 -0 xml-cocoon/lib/ant_1_3.jar
<<Binary file>>