Browse Source

Make sure new nativelib typelibrary is created. Also make it not cause for failure if you can't delete the dist directory

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270533 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
fe1594401f
1 changed files with 9 additions and 2 deletions
  1. +9
    -2
      proposal/myrmidon/build.xml

+ 9
- 2
proposal/myrmidon/build.xml View File

@@ -183,7 +183,6 @@ Legal:
<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 @@ Legal:
<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 @@ Legal:
</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 @@ Legal:
<!-- 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>


Loading…
Cancel
Save