From c93518d7a9c6820275c22dc66edb5b221df0855c Mon Sep 17 00:00:00 2001
From: Fraser Adams <fadams@apache.org>
Date: Fri, 19 Apr 2013 11:58:13 +0000
Subject: NO-JIRA: Trivial fix to build.xml in tools/src/java which was failing
 on cleanall target if plugins directory didn't actually exist

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1469793 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/tools/src/java/build.xml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'qpid/tools/src/java')

diff --git a/qpid/tools/src/java/build.xml b/qpid/tools/src/java/build.xml
index 1b19abd173..d1970604c1 100644
--- a/qpid/tools/src/java/build.xml
+++ b/qpid/tools/src/java/build.xml
@@ -225,17 +225,33 @@
 	<!-- =================================================================== -->
 	<!-- Removes everything except the sources enabling clean build.         -->
 	<!-- =================================================================== -->
-	<target name="cleanall" depends="clean">
+	<target name="cleanall" depends="clean, cleanplugin">
 		<delete includeemptydirs="true">
 			<fileset dir="." includes="**/*.*~ **/*~" defaultexcludes="no"/>
-
-			<fileset dir="${qpid.lib.plugins}" includes="qpid-broker-plugins-management-qmf2.jar qmf2.jar" 
-                     defaultexcludes="no"/>
 		</delete>
 
 		<delete dir="build"/>
 		<delete dir="docs"/>
 	</target>
 
+	<!-- =================================================================== -->
+	<!-- If plugins directory exists delete the plugin jars.                 -->
+	<!-- =================================================================== -->
+	<target name="cleanplugin" depends="test-for-plugin" if="dir.exists">
+		<delete includeemptydirs="true">
+			<fileset dir="${qpid.lib.plugins}" includes="qpid-broker-plugins-management-qmf2.jar qmf2.jar" 
+                     defaultexcludes="no"/>
+		</delete>
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Test for the presence of the plugins directory.                     -->
+	<!-- =================================================================== -->
+    <target name="test-for-plugin">
+        <condition property="dir.exists">
+            <available file="${qpid.lib.plugins}" type="dir"/>
+        </condition>
+    </target>
+
 </project>
 
-- 
cgit v1.2.1