[Qt-jambi-interest] [PATCH 5/5] Don't require ant-contrib.jar to be in the classpath anymore

[Francis Galiegue]

This commit plugs all *.antcontrib tasks into the build system. This means that
one does not need to have ant-contrib downloaded separately. However, this
does mean that a network access is required for build.

It should be noted also that the clean target also removes all traces of the
previous downloads. Not ideal, but this stretches the need for a separate
distclean target.

Signed-off-by: Francis Galiegue <fgaliegue at gmail.com>
---
 build.xml  |    1 +
 setenv.xml |   11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 3860d26..0439662 100644
--- a/build.xml
+++ b/build.xml
@@ -458,6 +458,7 @@
         <delete dir="${jardir}"/>
         <delete dir="${generator.outputdir}"/>
         <delete dir="${timestamp.dir}"/>
+        <delete dir="extjars"/>
         <delete dir="bin"/>
         <delete dir="lib"/>
         <delete dir="cpp"/>
diff --git a/setenv.xml b/setenv.xml
index 9d66e10..eb060f0 100644
--- a/setenv.xml
+++ b/setenv.xml
@@ -1,13 +1,12 @@
 <project name="qtjambi.setenv" default="setenv" basedir=".">
 
     <!--
-        This file will sets various properties necessary for the build process.
-        It is called from the main build.xml file.
+        This file has two purposes:
 
-        NOTE: it needs ant-contrib in your CLASSPATH environment variable.
+        * download ant-contrib and use it;
+        * set various properties necessary for the build process.
     -->
 
-    <taskdef resource="net/sf/antcontrib/antlib.xml"/>
     <property file="buildpath.properties"/>
     <property file="antcontrib.properties"/>
 
@@ -101,7 +100,7 @@
         Is qmake there?
     -->
 
-    <target name="lookup-qmake" depends="check-qtdir">
+    <target name="lookup-qmake" depends="check-qtdir, source.antcontrib">
         <var name="qtjambi.qmake" value="${env.QTDIR}/bin/qmake"/>
         <if>
             <os family="windows"/>
@@ -118,7 +117,7 @@
         </fail>
     </target>
 
-    <target name="lookup-libsubdir">
+    <target name="lookup-libsubdir" depends="source.antcontrib">
         <var name="libsubdir" value="lib"/>
         <if>
             <os family="windows"/>
-- 
1.6.6.rc3