hammant     2002/11/05 14:23:02

  Modified:    common/lib phoenix-client.jar
               db       build.xml
  Log:
  xdoclet changed fopr metagenerate
  
  Revision  Changes    Path
  1.11      +170 -170  jakarta-avalon-apps/common/lib/phoenix-client.jar
  
        <<Binary file>>
  
  
  1.61      +14 -19    jakarta-avalon-apps/db/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/build.xml,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- build.xml 2 Oct 2002 20:18:19 -0000       1.60
  +++ build.xml 5 Nov 2002 22:23:02 -0000       1.61
  @@ -22,7 +22,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"/>  
  @@ -184,40 +184,35 @@
     </target>
      
     <!-- Make .xinfo and manifest automatically for blocks -->
  -  <target name="phoenix-xdoclet" depends="compile">
  -  
  -    <mkdir dir="${build.xdoclet}"/>
  -  
  -    <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">
  +  <target name="phoenix-metagenerate" depends="compile">
  +
  +    <taskdef name="generatemeta" 
classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
  +      <classpath refid="project.class.path" />
  +    </taskdef>
  +
  +    <mkdir dir="${build.metagenerate}"/>
  +
  +    <generatemeta dest="${build.metagenerate}">
         <fileset dir="${java.dir}">
           <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}"/>
   
  -    <jar jarfile="${build.lib}/avalon-db.jar"
  -         manifest="${build.xdoclet}/manifest.mf">
  +    <jar jarfile="${build.lib}/avalon-db.jar">
         <fileset dir="${build.classes}">
           <include name="org/apache/avalon/db/**"/>
           <exclude name="org/apache/avalon/db/transport/cmdstream/client/**"/>
           <exclude name="org/apache/avalon/db/driver/**"/>
           <exclude name="org/apache/avalon/db/test/**"/>
         </fileset>
  -      <fileset dir="${build.xdoclet}">
  +      <fileset dir="${build.metagenerate}">
           <include name="org/apache/avalon/db/**/*.xinfo"/>
         </fileset>
       </jar>
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>

Reply via email to