Return-Path: <rubys@locus.apache.org>
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 98814 invoked by uid 1064); 29 Jul 2000 14:38:22 -0000
Date: 29 Jul 2000 14:38:22 -0000
Message-ID: <20000729143822.98813.qmail@locus.apache.org>
From: rubys@locus.apache.org
To: xml-cocoon-cvs@apache.org
Subject: cvs commit: xml-cocoon/lib ant.jar

rubys       00/07/29 07:38:22

  Modified:    .        Tag: xml-cocoon2 build.xml
               lib      Tag: xml-cocoon2 ant.jar
  Log:
  Don't filter images, and step up to latest release of Ant
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.18  +18 -2     xml-cocoon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/build.xml,v
  retrieving revision 1.6.2.17
  retrieving revision 1.6.2.18
  diff -u -r1.6.2.17 -r1.6.2.18
  --- build.xml	2000/07/25 18:48:21	1.6.2.17
  +++ build.xml	2000/07/29 14:38:21	1.6.2.18
  @@ -196,11 +196,17 @@
     <!-- Compiles the source directory                                       -->
     <!-- =================================================================== -->
     <target name="compile" depends="prepare-src">
  +    <copydir src="${build.src}" dest="${build.dest}">
  +      <include name="**/Manifest.mf" />
  +      <include name="**/*.xsl" />
  +    </copydir>
  +
       <javac srcdir="${build.src}"
              destdir="${build.dest}"
              debug="${debug}"
              optimize="${optimize}"
              deprecation="${deprecation}">
  +      <exclude name="**/*.html" />
         <exclude name="**/CocoonServlet*.java" unless="servlet.present" />
         <exclude name="**/SVGSerializer.java" unless="svg.present" />
         <exclude name="**/Javascript*" unless="rhino.present" />
  @@ -225,8 +231,18 @@
     <!-- =================================================================== -->
     <target name="webapp" depends="prepare">
       <mkdir dir="${build.war}"/>
  +
       <copydir src="${conf.dir}" dest="${build.war}" filtering="on"/>
  -    <copydir src="${samples.dir}" dest="${build.war}" filtering="on" excludes="README"/>
  +
  +    <copydir src="${samples.dir}" dest="${build.war}" filtering="on">
  +      <exclude name="**/images/*"/>
  +      <exclude name="README"/>
  +    </copydir>
  +
  +    <copydir src="${samples.dir}" dest="${build.war}" filtering="off">
  +      <include name="**/images/*"/>
  +    </copydir>
  +
       <jar jarfile="${build.dir}/${name}.war" 
            basedir="${build.war}"
            includes="**"/>
  @@ -329,7 +345,7 @@
   
       <copydir src="." dest="${dist.dir}" includes="README, LICENSE, build.*, index.html" filtering="on"/>
   
  -    <chmod perm="+x" src="${dist.dir}/build.sh"/>
  +    <chmod perm="+x" file="${dist.dir}/build.sh"/>
       <fixcrlf srcdir="${dist.dir}" includes="build.sh"  cr="remove"/>
       <fixcrlf srcdir="${dist.dir}" includes="build.bat" cr="add"/>
     </target>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.3   +603 -456  xml-cocoon/lib/Attic/ant.jar
  
  	<<Binary file>>