diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-09-29 17:16:44 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-09-29 17:16:44 +0000 |
| commit | 0f1bb4543e7bf03e3f7618216ef2a69919bc60b3 (patch) | |
| tree | 559e78ad1bf8dd76d2bfb1cfd7982cba9da2c09e /qpid/java/common/build.xml | |
| parent | e89fc340f6d86e844eb1368a1f40eed8e5bed37d (diff) | |
| download | qpid-python-0f1bb4543e7bf03e3f7618216ef2a69919bc60b3.tar.gz | |
QPID-5192: make the protocol and logging source generation explicitly triggered by setting -Dgenerate=true. Generate the files directly into the src dir so as to overwrite the previous versions upon request.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527353 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/build.xml')
| -rw-r--r-- | qpid/java/common/build.xml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/qpid/java/common/build.xml b/qpid/java/common/build.xml index 4b755cddd4..c2f777b18b 100644 --- a/qpid/java/common/build.xml +++ b/qpid/java/common/build.xml @@ -25,7 +25,11 @@ <import file="../module.xml"/> - <property name="selector.output.dir" value="${module.precompiled}/org/apache/qpid/filter/selector"/> + <property name="selector.output.dir" value="${module.src}/org/apache/qpid/filter/selector"/> + + <condition property="generate.selector.sources" value="true"> + <istrue value="${generate}"/> + </condition> <path id="common.source.generation.classpathref"> <pathelement path="${project.root}/${jython}" /> @@ -36,14 +40,15 @@ <target name="generate-sources"> <ant antfile="build-generate-sources.xml"> <reference torefid="source.generation.classpathref" refid="common.source.generation.classpathref" /> - <property name="generated-amqp-0-8-dir" value="${module.precompiled}"/> - <property name="generated-amqp-0-10-dir" value="${module.precompiled}"/> + <property name="generated-amqp-0-8-dir" value="${module.src}"/> + <property name="generated-amqp-0-10-dir" value="${module.src}"/> <property name="gentools.classes" value="${build.scratch}/common/gentools/classes"/> <property name="version.file" location="${module.classes}/qpidversion.properties"/> </ant> </target> - <target name="jms-selector"> + <target name="jms-selector" if="generate.selector.sources"> + <echo>Generating JMS selector sources</echo> <copy tofile="${module.build}/javacc.jar" failonerror="true"> <fileset dir="${project.root}/lib/required"> <include name="javacc-*.jar"/> |