ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon build.xml
Date Sat, 05 Jan 2002 03:26:35 GMT
donaldp     02/01/04 19:26:35

  Modified:    proposal/myrmidon build.xml
  Log:
  Make sure new nativelib typelibrary is created. Also make it not cause for failure if you
can't delete the dist directory
  
  Revision  Changes    Path
  1.29      +9 -2      jakarta-ant/proposal/myrmidon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- build.xml	23 Dec 2001 03:17:54 -0000	1.28
  +++ build.xml	5 Jan 2002 03:26:35 -0000	1.29
  @@ -183,7 +183,6 @@
       <replace file="${build.src}/${constants.file}" token="@@VERSION@@" value="${version}"
/>
       <replace file="${build.src}/${constants.file}" token="@@DATE@@" value="${TODAY}"
/>
   
  -
       <property name="ant.package" value="org/apache/tools/ant"/>
       <property name="antlib.package" value="org/apache/antlib"/>
       <property name="optional.package" value="${ant.package}/taskdefs/optional"/>
  @@ -307,6 +306,7 @@
         <include name="org/apache/myrmidon/interfaces/**" />
         <include name="org/apache/myrmidon/listeners/*" />
         <include name="org/apache/myrmidon/framework/**" />
  +      <include name="org/apache/tools/**" />
   <!--      <include name="org/apache/myrmidon/*" />
         <include name="org/apache/myrmidon/components/**"/>
         <include name="org/apache/myrmidon/frontends/*" /> -->
  @@ -350,6 +350,13 @@
         </zipfileset>
       </jar>
   
  +    <jar jarfile="${build.lib}/nativelib.atl" basedir="${build.classes}">
  +      <include name="org/apache/antlib/nativelib/**" />
  +      <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-descriptor.xml">
  +        <include name="nativelib-ant-descriptor.xml"/>
  +      </zipfileset>
  +    </jar>
  +
       <jar jarfile="${build.lib}/selftest.atl"
            basedir="${build.classes}"
            manifest="${manifest.dir}/selftest.mf">
  @@ -431,7 +438,7 @@
     <!-- Cleans up build and distribution directories -->
     <target name="clean">
       <delete dir="${build.dir}"/>
  -    <delete dir="${dist.dir}"/>
  +    <delete dir="${dist.dir}" failonerror="false"/>
       <delete>
         <fileset dir="." includes="**/*~" defaultexcludes="no"/>
       </delete>
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message