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-generate-sources.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-generate-sources.xml')
| -rw-r--r-- | qpid/java/common/build-generate-sources.xml | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/qpid/java/common/build-generate-sources.xml b/qpid/java/common/build-generate-sources.xml index 26adeb6ae7..141d48eeee 100644 --- a/qpid/java/common/build-generate-sources.xml +++ b/qpid/java/common/build-generate-sources.xml @@ -33,6 +33,10 @@ </condition> </fail> + <condition property="generate.protocol.sources" value="true"> + <istrue value="${generate}"/> + </condition> + <property name="mllib.dir" value="${basedir}/../../python"/> <property name="xml.spec.dir" value="${basedir}/../../specs"/> @@ -46,9 +50,6 @@ <property name="gentools.src" value="${basedir}/gentools/src"/> <property name="generated.package" value="org/apache/qpid/framing" /> - <property name="amqp-0-8-generation.timestamp" location="${generated-amqp-0-8-dir}/amqp-0-8-generation.timestamp" /> - <property name="amqp-0-10-generation.timestamp" location="${generated-amqp-0-10-dir}/amqp-0-10-generation.timestamp" /> - <property name="version.file" location="${basedir}/target/classes/qpidversion.properties"/> <property file="${version.file}" prefix="old."/> @@ -74,13 +75,7 @@ qpid.name=qpid </echo> </target> - <target name="check-amqp-0-10-generation-required"> - <uptodate property="amqp-0-10-generation-not-required" targetfile="${amqp-0-10-generation.timestamp}"> - <srcfiles dir="${xml.spec.dir}" includes="amqp.0-10-qpid-errata.stripped.xml" /> - </uptodate> - </target> - - <target name="amqp-0-10-generation" depends="check-amqp-0-10-generation-required" unless="amqp-0-10-generation-not-required"> + <target name="amqp-0-10-generation" if="generate.protocol.sources"> <mkdir dir="${generated-amqp-0-10-dir}"/> <echo message="Generating AMQP 0-10 protocol classes..."/> <java classname="org.python.util.jython" dir="${generated-amqp-0-10-dir}" fork="true" failonerror="true"> @@ -93,7 +88,6 @@ qpid.name=qpid </classpath> <sysproperty key="python.path" value ="${mllib.dir}"/> </java> - <touch file="${amqp-0-10-generation.timestamp}" /> </target> <target name="compile-gentools"> @@ -105,13 +99,7 @@ qpid.name=qpid </javac> </target> - <target name="check-amqp-0-8-generation-required"> - <uptodate property="amqp-0-8-generation-not-required" targetfile="${amqp-0-8-generation.timestamp}"> - <srcfiles dir="${xml.spec.dir}" includes="${xml.spec.deps.0-8}" /> - </uptodate> - </target> - - <target name="amqp-0-8-generation" depends="compile-gentools, check-amqp-0-8-generation-required" unless="amqp-0-8-generation-not-required"> + <target name="amqp-0-8-generation" depends="compile-gentools" if="generate.protocol.sources"> <mkdir dir="${generated-amqp-0-8-dir}/${generated.package}"/> <echo message="Generating AMQP 0-8/0-9/0-9-1 protocol classes..."/> <java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.classes}" failonerror="true"> @@ -121,7 +109,6 @@ qpid.name=qpid <path refid="source.generation.classpathref"/> </classpath> </java> - <touch file="${amqp-0-8-generation.timestamp}" /> </target> <target name="generate-sources" depends="amqp-0-8-generation, amqp-0-10-generation, create-version"/> |