diff options
| author | Fraser Adams <fadams@apache.org> | 2013-04-19 11:58:13 +0000 |
|---|---|---|
| committer | Fraser Adams <fadams@apache.org> | 2013-04-19 11:58:13 +0000 |
| commit | c93518d7a9c6820275c22dc66edb5b221df0855c (patch) | |
| tree | c5c725b2f5155ce63b27cdae209c6663759bb9bf | |
| parent | d4c8ebc4ed199b257bcc74ef263ffd1ea1f770fd (diff) | |
| download | qpid-python-c93518d7a9c6820275c22dc66edb5b221df0855c.tar.gz | |
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
| -rw-r--r-- | qpid/tools/src/java/build.xml | 24 |
1 files changed, 20 insertions, 4 deletions
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> |