diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-12-19 17:16:02 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-12-19 17:16:02 +0000 |
| commit | 8b699790ba39600f327132aa6380d8caad9d3bcd (patch) | |
| tree | 8c8a9e8e6a188eb688eaaff506d3c52162541329 | |
| parent | 8aeb355b1970eaa8fd2302afc52ca7af225b5e3b (diff) | |
| download | qpid-python-8b699790ba39600f327132aa6380d8caad9d3bcd.tar.gz | |
QPID-4511: move the broker-plugins lib dir under build/scratch to prevent it being included in the binary produced by 'ant release'.
Updates the 'if' conditional on the copy target for compatibility with Ant versions < 1.7.1.
merged from trunk r1423829
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.20@1423964 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/build.xml | 2 | ||||
| -rw-r--r-- | qpid/java/common.xml | 2 | ||||
| -rw-r--r-- | qpid/java/module.xml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml index 3c4a7d81c6..8581b7c639 100644 --- a/qpid/java/broker/build.xml +++ b/qpid/java/broker/build.xml @@ -56,7 +56,7 @@ <target name="release-bin-copy-broker-plugins" description="copy broker-plugins into module release"> <copy todir="${module.release}/lib/plugins" failonerror="true"> - <fileset dir="${build.lib.broker.plugins}"/> + <fileset dir="${build.scratch.broker.plugins.lib}"/> </copy> </target> diff --git a/qpid/java/common.xml b/qpid/java/common.xml index 4f25544d13..388dae1f40 100644 --- a/qpid/java/common.xml +++ b/qpid/java/common.xml @@ -42,7 +42,7 @@ <property name="build.report" location="${build}/report"/> <property name="build.release" location="${build}/release"/> <property name="build.release.prepare" location="${build.release}/prepare"/> - <property name="build.lib.broker.plugins" location="${build}/lib/broker-plugins"/> + <property name="build.scratch.broker.plugins.lib" location="${build.scratch}/broker-plugins/lib"/> <property name="build.coverage.report" location="${build}/coverage/report"/> <property name="build.coverage.src" location="${build}/coverage/src"/> <property name="build.findbugs" location="${build}/findbugs"/> diff --git a/qpid/java/module.xml b/qpid/java/module.xml index 26349fb41c..ccfbd696e0 100644 --- a/qpid/java/module.xml +++ b/qpid/java/module.xml @@ -240,7 +240,7 @@ <mkdir dir="${build.etc}"/> <mkdir dir="${build.lib}"/> <mkdir dir="${build.results}"/> - <mkdir dir="${build.lib.broker.plugins}"/> + <mkdir dir="${build.scratch.broker.plugins.lib}"/> <mkdir dir="${module.classes}"/> <mkdir dir="${module.precompiled}"/> <mkdir dir="${module.api}"/> @@ -508,8 +508,8 @@ </jar> </target> - <target name="copy-broker-plugin-jars" if="${broker.plugin}" description="copy broker plugins for use in release packaging"> - <copy file="${module.jar}" todir="${build.lib.broker.plugins}" failonerror="true"/> + <target name="copy-broker-plugin-jars" if="broker.plugin" description="copy broker plugins for use in release packaging"> + <copy file="${module.jar}" todir="${build.scratch.broker.plugins.lib}" failonerror="true"/> </target> <target name="copy-module-metainf" depends="copy-metainf-resources" if="module.src.resources.metainf.exists"> |