[jboss-cvs] JBossAS SVN: r82993 - in trunk: tools/lib and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2009-01-16 11:49:06 -0500 (Fri, 16 Jan 2009)
New Revision: 82993

Added:
   trunk/tools/lib/ant-contrib-1.0b3.jar
Modified:
   trunk/build/build.xml
Log:
Improve logic for determining when to generate thirdparty directory.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-01-16 16:39:42 UTC (rev 82992)
+++ trunk/build/build.xml	2009-01-16 16:49:06 UTC (rev 82993)
@@ -29,7 +29,13 @@
 
   &buildmagic;
 
-
+  <!-- Add the antcontrib tasks -->
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+    <classpath>
+      <pathelement location="${basedir}../tools/lib/ant-contrib-1.0b3.jar"/>
+    </classpath>
+  </taskdef>
+  
   <!-- ================================================================== -->
   <!-- Initialization                                                     -->
   <!-- ================================================================== -->
@@ -976,7 +982,7 @@
 
   <!-- Clean up all build output -->
   <target name="clean" description="Cleans up most generated files."
-          depends="checkthirdparty, createthirdparty, maven-clean, _buildmagic:clean, 
+          depends="checkthirdparty, maven-clean, _buildmagic:clean, 
                    modules-clean">
   </target>
 
@@ -1037,8 +1043,14 @@
   </target>
   
   <target name="checkthirdparty">
-    <available property="inhibit.downloads"
-               file="${basedir}/../thirdparty/libraries.ent"/>
+    <if>
+      <not>
+        <available file="${basedir}/../thirdparty/libraries.ent"/>
+      </not>
+      <then>
+        <antcall target="createthirdparty"/>
+      </then>
+    </if>
   </target>
   
    <!-- Call maven to create the thirdparty folder from artifacts in the maven repository -->

Added: trunk/tools/lib/ant-contrib-1.0b3.jar
===================================================================
(Binary files differ)


Property changes on: trunk/tools/lib/ant-contrib-1.0b3.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream