I think this is better. Only define the weave taskdef in the two targets we need it. This adds some duplicate code, but we turn the onerror fail back on, so if the library is not found then ant will throw an error and exit. But it will only do this if you try to run the targets which need this taskdef.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4380 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Jonathan Le Plastrier
2006-09-26 22:52:58 +00:00
parent cade4b6435
commit 11e08c165e
+4 -2
View File
@@ -177,13 +177,13 @@
</target>
<!-- various bits used by the retroweaver tasks -->
<taskdef name="weave" classpathref="classpath" onerror="report"
classname="com.rc.retroweaver.ant.RetroWeaverTask"/>
<property name="inpre" value="${deploy.dir}/${app.name}"/>
<property name="outpre" value="${deploy.dir}/retro/${app.name}"/>
<!-- a helper task for 'retro' -->
<target name="vweave">
<taskdef name="weave" classpathref="classpath"
classname="com.rc.retroweaver.ant.RetroWeaverTask"/>
<path id="retrocp">
<pathelement location="/usr/local/jdk1.4/jre/lib/rt.jar"/>
<fileset dir="lib" includes="**/*.jar"/>
@@ -197,6 +197,8 @@
<!-- converts our 1.5 code to a 1.4 compatible format -->
<target name="retro" depends="dist">
<taskdef name="weave" classpathref="classpath"
classname="com.rc.retroweaver.ant.RetroWeaverTask"/>
<mkdir dir="${deploy.dir}/retro"/>
<!-- we weave everything a first time without verification so that -->