cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From philippe.lav...@cactus.ca
Subject [PATCH] to use ant 1.3
Date Mon, 05 Mar 2001 16:22:52 GMT

Hi guys,

I'm including the build.xml 'cvs diff -u' to get a valid build file with ant
1.3

Please note that 

cvs remove ant_1_1.jar
cvs add ant_1_3.jar

is left as an exercice to the reader.

Have fun

Phil

Index: build.xml
===================================================================
RCS file: /home/cvspublic/xml-cocoon/build.xml,v
retrieving revision 1.68
diff -u -r1.68 build.xml
--- build.xml	2001/01/26 23:55:33	1.68
+++ build.xml	2001/03/05 16:19:13
@@ -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>
 
   <!-- ===================================================================
-->
@@ -326,7 +335,7 @@
   <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"/>
+    <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}"
           args="targetDirectory=${site} ${docs.dir}/book.xml
${browser.skin}"/>
   </target>
@@ -366,20 +375,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"/>


Mime
View raw message