leif 2002/08/07 20:40:50
Modified: . build.xml
Log:
.ico files were being copied with filtering on, breaking the build with an
NPE.
Revision Changes Path
1.143 +13 -9 jakarta-avalon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon/build.xml,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- build.xml 5 Aug 2002 13:23:55 -0000 1.142
+++ build.xml 8 Aug 2002 03:40:49 -0000 1.143
@@ -342,7 +342,7 @@
<delete dir="${build.dir}/work"/>
- <mkdir dir="${build.context}"/>
+ <mkdir dir="${build.context}"/>
<mkdir dir="${build.docs}"/>
<mkdir dir="${build.xdocs}"/>
<mkdir dir="${build.dir}/work"/>
@@ -369,6 +369,7 @@
<copy todir="${build.context}" overwrite="true" filtering="on">
<fileset dir="${context.dir}">
+ <exclude name="**/*.ico"/>
<exclude name="**/*.gif"/>
<exclude name="**/*.jpg"/>
<exclude name="**/*.png"/>
@@ -377,6 +378,7 @@
<copy todir="${build.context}" filtering="off">
<fileset dir="${context.dir}">
+ <include name="**/*.ico"/>
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
<include name="**/*.png"/>
@@ -395,24 +397,24 @@
<java classname="org.apache.cocoon.Main" fork="true"
maxmemory="128m" failonerror="true">
<arg value="-c${build.context}/"/>
- <arg value="-d${build.docs}"/>
- <arg value="-k${build.context}/logkit.xconf"/>
- <arg value="-w${build.dir}/work"/>
- <!-- <arg value="-l${build.dir}/work/cocoon.log"/> -->
+ <arg value="-d${build.docs}"/>
+ <arg value="-k${build.context}/logkit.xconf"/>
+ <arg value="-w${build.dir}/work"/>
+ <!-- <arg value="-l${build.dir}/work/cocoon.log"/> -->
<arg value="-uERROR"/>
<arg value="index.html"/>
<classpath>
<path refid="tools.class.path"/>
<fileset dir="${tools.dir}/ext">
- <include name="*.jar"/>
- </fileset>
+ <include name="*.jar"/>
+ </fileset>
</classpath>
</java>
<delete dir="${build.dir}/work"/>
- <echo message=" ...docs generated succesfully in ./build/docs dir."/>
- <echo
message="-------------------------------------------------------------"/>
+ <echo message=" ...docs generated succesfully in ./build/docs
dir."/>
+ <echo
message="-------------------------------------------------------------"/>
<mkdir dir="${build.docs}/framework/diagrams"/>
<copy todir="${build.docs}/framework/diagrams" filtering="off">
@@ -514,6 +516,7 @@
<copy todir="${build.context}" overwrite="true" filtering="on">
<fileset dir="${context.dir}">
+ <exclude name="**/*.ico"/>
<exclude name="**/*.gif"/>
<exclude name="**/*.jpg"/>
<exclude name="**/*.png"/>
@@ -521,6 +524,7 @@
</copy>
<copy todir="${build.context}" filtering="off">
<fileset dir="${context.dir}">
+ <include name="**/*.ico"/>
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
<include name="**/*.png"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
