cziegeler 01/11/29 04:40:04 Modified: . build.xml Log: Fixing build system Revision Changes Path 1.115 +28 -9 xml-cocoon2/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/build.xml,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- build.xml 2001/11/26 14:46:32 1.114 +++ build.xml 2001/11/29 12:40:03 1.115 @@ -1140,8 +1140,8 @@ <fileset dir="${bin.dir}"/> </copy> - <copy todir="${dist.src.dir}/documentation" filtering="on"> - <fileset dir="${context.dir}"/> + <copy todir="${dist.src.dir}/documentation"> + <fileset dir="${build.context}"/> </copy> <copy todir="${dist.src.dir}/lib"> @@ -1149,17 +1149,41 @@ </copy> <copy todir="${dist.src.dir}/resources" filtering="on"> - <fileset dir="${resource.dir}"/> + <fileset dir="${resource.dir}"> + <exclude name="**/*.gif"/> + <exclude name="**/*.jpg"/> + <exclude name="**/*.png"/> + </fileset> </copy> + <copy todir="${dist.src.dir}/resources" filtering="off"> + <fileset dir="${resource.dir}"> + <include name="**/*.gif"/> + <include name="**/*.jpg"/> + <include name="**/*.png"/> + </fileset> + </copy> + <copy todir="${dist.src.dir}/src" filtering="on"> <fileset dir="${src.dir}"/> </copy> <copy todir="${dist.src.dir}/webapp" filtering="on"> - <fileset dir="${webapp.dir}"/> + <fileset dir="${webapp.dir}"> + <exclude name="**/*.gif"/> + <exclude name="**/*.jpg"/> + <exclude name="**/*.png"/> + </fileset> </copy> + <copy todir="${dist.src.dir}/webapp" filtering="off"> + <fileset dir="${webapp.dir}"> + <include name="**/*.gif"/> + <include name="**/*.jpg"/> + <include name="**/*.png"/> + </fileset> + </copy> + <!-- Fix for web.xml, cocoon.xconf and sitemap.xmap --> <copy file="${webapp.dir}/cocoon.xconf" tofile="${dist.src.dir}/webapp/cocoon.xconf" filtering="off" overwrite="yes"/> <copy file="${webapp.dir}/sitemap.xmap" tofile="${dist.src.dir}/webapp/sitemap.xmap" filtering="off" overwrite="yes"/> @@ -1236,11 +1260,6 @@ <copy todir="${dist.bin.dir}/webapp"> <fileset dir="${build.war}"/> </copy> - - <!-- Fix for web.xml, cocoon.xconf and sitemap.xmap --> - <copy file="${webapp.dir}/cocoon.xconf" tofile="${dist.bin.dir}/webapp/cocoon.xconf" filtering="off" overwrite="yes"/> - <copy file="${webapp.dir}/sitemap.xmap" tofile="${dist.bin.dir}/webapp/sitemap.xmap" filtering="off" overwrite="yes"/> - <copy file="${webapp.dir}/WEB-INF/web.xml" tofile="${dist.bin.dir}/webapp/WEB-INF/web.xml" filtering="off" overwrite="yes"/> <!-- And now the jars --> <copy todir="${dist.bin.dir}/webapp/WEB-INF/lib">
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]