From 4dcb5616f45e73c646b21492b047db8cdc0f6536 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Wed, 30 Nov 2011 16:06:30 +0000
Subject: NO-JIRA: copy optional module scripts if the module is requested

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1208479 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/broker/build.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml
index 0731e08103..090df101f0 100644
--- a/qpid/java/broker/build.xml
+++ b/qpid/java/broker/build.xml
@@ -72,14 +72,26 @@
         <fixcrlf srcdir="${module.release}/bin" fixlast="true" eol="dos" includes="*.bat"/>
     </target>
 
-    <target name="release-bin-other" description="copy broker-plugins into module release">
+    <target name="release-bin-other" depends="release-bin-other-bdbstore" description="copy broker-plugins into module release">
         <copy todir="${module.release}/lib/plugins" failonerror="true">
             <fileset dir="${build.lib}/plugins"/>
         </copy>
-        <!--copy optional bdbstore module if it exists -->
-        <copy todir="${module.release}/lib/" failonerror="false">
+    </target>
+
+    <target name="release-bin-other-bdbstore" depends="check-bdbstore-requested" if="bdbstore-requested"
+                                         description="copy bdbstore items into module release">
+        <copy todir="${module.release}/lib/" failonerror="true">
             <fileset file="${build.lib}/${project.name}-bdbstore-${project.version}.jar"/>
         </copy>
+        <copy todir="${module.release}/bin" failonerror="true" flatten="true">
+            <fileset dir="${basedir}/../bdbstore/bin"/>
+        </copy>
+    </target>
+
+    <target name="check-bdbstore-requested">
+         <condition property="bdbstore-requested">
+             <contains string="${modules.opt}" substring="bdbstore"/>
+         </condition>
     </target>
 
     <target name="release-bin" depends="release-bin-tasks"/>
-- 
cgit v1.2.1