diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-05-14 21:11:40 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-05-14 21:11:40 +0000 |
| commit | fdc717cc97eb61bbb55189090aa5910136cf1228 (patch) | |
| tree | 497482b0a8bdfa4bb8afad964dc67fc7d1eaa351 | |
| parent | c18230d6b6734f8f0a1319dbe03d34f2633d6947 (diff) | |
| download | qpid-python-fdc717cc97eb61bbb55189090aa5910136cf1228.tar.gz | |
QPID-3994: add ability to specify -Doptional=true to enable all optional modules and download of optional dependencies
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1338428 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/bdbstore/build.xml | 1 | ||||
| -rw-r--r-- | qpid/java/build.xml | 7 | ||||
| -rw-r--r-- | qpid/java/common.xml | 5 | ||||
| -rw-r--r-- | qpid/java/perftests/visualisation-jfc/build.xml | 1 |
4 files changed, 12 insertions, 2 deletions
diff --git a/qpid/java/bdbstore/build.xml b/qpid/java/bdbstore/build.xml index 79dbcc3073..7a95dde8a7 100644 --- a/qpid/java/bdbstore/build.xml +++ b/qpid/java/bdbstore/build.xml @@ -31,6 +31,7 @@ <or> <istrue value="${download-bdb}"/> <istrue value="${optional.dependencies}"/> + <istrue value="${optional}"/> </or> </condition> diff --git a/qpid/java/build.xml b/qpid/java/build.xml index 4cf91340dc..5ac4b03a03 100644 --- a/qpid/java/build.xml +++ b/qpid/java/build.xml @@ -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}"/> diff --git a/qpid/java/common.xml b/qpid/java/common.xml index 6d65f68fc2..ab71642053 100644 --- a/qpid/java/common.xml +++ b/qpid/java/common.xml @@ -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> diff --git a/qpid/java/perftests/visualisation-jfc/build.xml b/qpid/java/perftests/visualisation-jfc/build.xml index 91bd2eeddd..f8b1b8a10a 100644 --- a/qpid/java/perftests/visualisation-jfc/build.xml +++ b/qpid/java/perftests/visualisation-jfc/build.xml @@ -35,6 +35,7 @@ <or> <istrue value="${download-jfree}"/> <istrue value="${optional.dependencies}"/> + <istrue value="${optional}"/> </or> </condition> |