jefft 2003/01/25 04:58:20 Modified: . build.xml Log: Fix dist-bin target (eg was missing *-block.jar) PR: 13220 Submitted by: Alfred Nathaniela <Alfred.Nathaniel at swx.com> Revision Changes Path 1.311 +12 -5 xml-cocoon2/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/build.xml,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- build.xml 24 Jan 2003 08:21:21 -0000 1.310 +++ build.xml 25 Jan 2003 12:58:20 -0000 1.311 @@ -2050,7 +2050,7 @@ <include name="*.properties"/> </fileset> </copy> - <copy file="INSTALL.src" tofile="${dist.src}/INSTALL" filtering="on"/> + <copy file="INSTALL-SRC.txt" tofile="${dist.src}/INSTALL" filtering="on"/> <chmod perm="+x" file="${dist.src}/run.sh"/> <chmod perm="+x" file="${dist.src}/build.sh"/> @@ -2121,12 +2121,19 @@ <include name="*.jar"/> <exclude name="servlet*.jar"/> </fileset> - </copy> + </copy> + + <copy todir="${dist.bin}/webapp/WEB-INF/lib"> + <fileset dir="${build.dir}"> + <include name="*-block.jar"/> + </fileset> + <mapper type="glob" from="*-block.jar" to="cocoon-*-block-${version}.jar"/> + </copy> <copy file="${build.dir}/${name}.jar" tofile="${dist.bin}/webapp/WEB-INF/lib/${name}-${version}.jar"/> <copy file="${build.dir}/${name}-samples.jar" - tofile="${dist.bin}/webapp/WEB-INF/lib/"/> + todir="${dist.bin}/webapp/WEB-INF/lib/"/> <copy todir="${dist.bin}/docs"> <fileset dir="${build.docs}"/> @@ -2150,7 +2157,7 @@ <include name="KEYS"/> </fileset> </copy> - <copy file="INSTALL.bin" tofile="${dist.bin}/INSTALL" filtering="on"/> + <copy file="INSTALL-BIN.txt" tofile="${dist.bin}/INSTALL" filtering="on"/> <!-- Build the war file --> <jar jarfile="${dist.bin}/${name}.war"
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]