You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2002/11/05 23:36:48 UTC

cvs commit: jakarta-avalon-apps/ftpserver build.xml

hammant     2002/11/05 14:36:48

  Modified:    ftpserver build.xml
  Log:
  xdoclet got rid of
  
  Revision  Changes    Path
  1.44      +13 -18    jakarta-avalon-apps/ftpserver/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/build.xml,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- build.xml	2 Oct 2002 20:18:20 -0000	1.43
  +++ build.xml	5 Nov 2002 22:36:48 -0000	1.44
  @@ -23,7 +23,7 @@
     <!-- Set the properties for intermediate directory -->
     <property name="build.dir" value="build"/>
     <property name="build.lib" value="${build.dir}/lib"/>
  -  <property name="build.xdoclet" value="${build.dir}/xdoclet"/>  
  +  <property name="build.metagenerate" value="${build.dir}/metagenerate"/>  
     <property name="build.src" value="${build.dir}/src"/>
     <property name="build.classes" value="${build.dir}/classes"/>
     <property name="build.javadocs" value="${build.dir}/javadocs"/>
  @@ -108,28 +108,24 @@
   
   
     <!-- Make .xinfo and manifest automatically for blocks -->
  -  <target name="phoenix-xdoclet" depends="compile">
  +  <target name="phoenix-metagenerate" depends="compile">
     
  -    <mkdir dir="${build.xdoclet}"/>
  +    <mkdir dir="${build.metagenerate}"/>
     
  -    <taskdef name="phoenix-blocks"
  -             classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
  -             classpathref="project.class.path"/>
  -
  -    <phoenix-blocks
  -        destdir="${build.xdoclet}"
  -        classpathref="project.class.path">
  +    <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
  +      <classpath refid="project.class.path" />
  +    </taskdef>
  +
  +    <generatemeta dest="${build.metagenerate}">
         <fileset dir="${java.dir}">
  -        <include name="**" />
  +        <include name="**/*.java" />
         </fileset>
  -      <blockinfo/>
  -      <manifest manifestFile="manifest.mf" />
  -    </phoenix-blocks>
  +    </generatemeta>
       
     </target>  
   
     <!-- Jars up project -->
  -  <target name="jars" depends="phoenix-xdoclet">
  +  <target name="jars" depends="phoenix-metagenerate">
     
       <mkdir dir="${build.lib}"/>
   
  @@ -147,10 +143,9 @@
       </jar>
   
       <!-- jar file -->
  -    <jar jarfile="${build.lib}/${name}.jar"
  -         manifest="${build.xdoclet}/manifest.mf">
  +    <jar jarfile="${build.lib}/${name}.jar">
         <fileset dir="${build.classes}" excludes="**/gui/*"/>
  -      <fileset dir="${build.xdoclet}">
  +      <fileset dir="${build.metagenerate}">
           <include name="**/*.xinfo"/>
         </fileset>
       </jar>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>