From 11e08c165efc7703b5557efbef19e3b2688aa19e Mon Sep 17 00:00:00 2001
From: Jonathan Le Plastrier <jonathan@threerings.net>
Date: Tue, 26 Sep 2006 22:52:58 +0000
Subject: [PATCH] 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
---
 build.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index fa858666d..739631797 100644
--- a/build.xml
+++ b/build.xml
@@ -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 -->