avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-apps/hsql build.xml
Date Tue, 05 Nov 2002 22:39:43 GMT
hammant     2002/11/05 14:39:43

  Modified:    hsql     build.xml
  Log:
  xdocelt got rid of
  
  Revision  Changes    Path
  1.30      +12 -17    jakarta-avalon-apps/hsql/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/hsql/build.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- build.xml	7 Oct 2002 05:43:18 -0000	1.29
  +++ build.xml	5 Nov 2002 22:39:43 -0000	1.30
  @@ -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"/>  
  @@ -122,37 +122,32 @@
     </target>
   
     <!-- 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="**/*.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}/${name}.jar"
  -         manifest="${build.xdoclet}/manifest.mf">
  +    <jar jarfile="${build.lib}/${name}.jar">
         <fileset dir="${build.classes}">
           <include name="org/apache/avalon/hsql/**"/>
         </fileset>
  -      <fileset dir="${build.xdoclet}">
  +      <fileset dir="${build.metagenerate}">
           <include name="org/apache/avalon/hsql/**/*.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>


Mime
View raw message