Author: robbie
Date: Mon May 14 21:11:40 2012
New Revision: 1338428
URL: http://svn.apache.org/viewvc?rev=1338428&view=rev
Log:
QPID-3994: add ability to specify -Doptional=true to enable all optional
modules and download of optional dependencies
Modified:
qpid/trunk/qpid/java/bdbstore/build.xml
qpid/trunk/qpid/java/build.xml
qpid/trunk/qpid/java/common.xml
qpid/trunk/qpid/java/perftests/visualisation-jfc/build.xml
Modified: qpid/trunk/qpid/java/bdbstore/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/build.xml?rev=1338428&r1=1338427&r2=1338428&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/build.xml Mon May 14 21:11:40 2012
@@ -31,6 +31,7 @@
<or>
<istrue value="${download-bdb}"/>
<istrue value="${optional.dependencies}"/>
+ <istrue value="${optional}"/>
</or>
</condition>
Modified: qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1338428&r1=1338427&r2=1338428&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Mon May 14 21:11:40 2012
@@ -26,12 +26,17 @@
<findSubProjects name="client-plugins" dir="client-plugins"/>
<findSubProjects name="management" dir="management"
excludes="common,example"/>
+ <property name="optional" value="false"/>
+ <property name="modules.opt.default" value="bdbstore
perftests/visualisation-jfc"/>
+ <condition property="modules.opt" value="" else="${modules.opt.default}">
+ <isfalse value="${optional}"/>
+ </condition>
+
<property name="modules.core" value="common management/common
amqp-1-0-common broker client amqp-1-0-client amqp-1-0-client-jms tools"/>
<property name="modules.examples" value="client/example
management/example"/>
<property name="modules.tests" value="systests perftests"/>
<property name="modules.management" value="${management}"/>
<property name="modules.plugin" value="${broker-plugins}
${client-plugins}"/>
- <property name="modules.opt" value=""/>
<property name="modules.jca" value="jca"/>
<property name="modules" value="${modules.core}
${modules.examples}
${modules.management} ${modules.jca} ${modules.tests} ${modules.plugin}
${modules.opt}"/>
Modified: qpid/trunk/qpid/java/common.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1338428&r1=1338427&r2=1338428&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Mon May 14 21:11:40 2012
@@ -124,7 +124,10 @@
<condition property="ivy.retrieve.optional">
<and>
<istrue value="${retrieve.dependencies}"/>
- <istrue value="${optional.dependencies}"/>
+ <or>
+ <istrue value="${optional.dependencies}"/>
+ <istrue value="${optional}"/>
+ </or>
</and>
</condition>
Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/build.xml?rev=1338428&r1=1338427&r2=1338428&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/visualisation-jfc/build.xml (original)
+++ qpid/trunk/qpid/java/perftests/visualisation-jfc/build.xml Mon May 14
21:11:40 2012
@@ -35,6 +35,7 @@
<or>
<istrue value="${download-jfree}"/>
<istrue value="${optional.dependencies}"/>
+ <istrue value="${optional}"/>
</or>
</condition>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
