You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by fa...@apache.org on 2013/04/19 13:58:13 UTC

svn commit: r1469793 - /qpid/trunk/qpid/tools/src/java/build.xml

Author: fadams
Date: Fri Apr 19 11:58:13 2013
New Revision: 1469793

URL: http://svn.apache.org/r1469793
Log:
NO-JIRA: Trivial fix to build.xml in tools/src/java which was failing on cleanall target if plugins directory didn't actually exist

Modified:
    qpid/trunk/qpid/tools/src/java/build.xml

Modified: qpid/trunk/qpid/tools/src/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/build.xml?rev=1469793&r1=1469792&r2=1469793&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/build.xml (original)
+++ qpid/trunk/qpid/tools/src/java/build.xml Fri Apr 19 11:58:13 2013
@@ -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>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org