You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/09/29 19:16:44 UTC
svn commit: r1527353 - in /qpid/trunk/qpid/java:
broker-core/build-generate-sources.xml common/build-generate-sources.xml
common/build.xml
Author: robbie
Date: Sun Sep 29 17:16:44 2013
New Revision: 1527353
URL: http://svn.apache.org/r1527353
Log:
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.
Modified:
qpid/trunk/qpid/java/broker-core/build-generate-sources.xml
qpid/trunk/qpid/java/common/build-generate-sources.xml
qpid/trunk/qpid/java/common/build.xml
Modified: qpid/trunk/qpid/java/broker-core/build-generate-sources.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/build-generate-sources.xml?rev=1527353&r1=1527352&r2=1527353&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/build-generate-sources.xml (original)
+++ qpid/trunk/qpid/java/broker-core/build-generate-sources.xml Sun Sep 29 17:16:44 2013
@@ -18,29 +18,33 @@
- under the License.
-
-->
-<project name="QpidBrokerGenerateSources" default="generate-logmessages">
+<project name="QpidBrokerCoreGenerateSources" default="generate-logmessages">
<!-- Additions to perform LogMessage generation. To enable for a given
module using the Ant build, add the following to the build.xml:
- <import file="${project.root}/broker/build-generate-sources.xml"/>
+ <import file="${project.root}/broker-core/build-generate-sources.xml"/>
<target name="precompile" depends="generate-logmessages"/> -->
- <dirname property="QpidBrokerGenerateSources.basedir" file="${ant.file.QpidBrokerGenerateSources}"/>
+ <dirname property="QpidBrokerCoreGenerateSources.basedir" file="${ant.file.QpidBrokerCoreGenerateSources}"/>
<property name="gentools.classes" location="${build.scratch}/common/gentools" />
- <property name="generated-logmessages-dir" location="${module.precompiled}" />
- <property name="velocity.classes" value="${build.scratch}/broker/velocity"/>
+ <property name="generated-logmessages-dir" location="${module.src}" />
+ <property name="velocity.classes" value="${build.scratch}/broker-core/velocity"/>
<property name="velocity.timestamp" location="${generated-logmessages-dir}/velocity.timestamp" />
- <property name="velocity.src.dir" value="${QpidBrokerGenerateSources.basedir}/src/velocity/java"/>
- <property name="velocity.template.dir" value="${QpidBrokerGenerateSources.basedir}/src/velocity/templates/org/apache/qpid/server/logging/messages"/>
+ <property name="velocity.src.dir" value="${QpidBrokerCoreGenerateSources.basedir}/src/velocity/java"/>
+ <property name="velocity.template.dir" value="${QpidBrokerCoreGenerateSources.basedir}/src/velocity/templates/org/apache/qpid/server/logging/messages"/>
<path id="source.generation.classpathref">
<pathelement path="${project.root}/${velocity.jar}" />
<pathelement path="${project.root}/${velocity-dep.jar}" />
</path>
+ <condition property="generate.logmessage.sources" value="true">
+ <istrue value="${generate}"/>
+ </condition>
+
<target name="compile-logmessages-generator" >
<mkdir dir="${velocity.classes}" />
<!-- Compile LogMessages Velocity Generator -->
@@ -60,7 +64,7 @@
</uptodate>
</target>
- <target name="generate-logmessages" depends="compile-logmessages-generator,check-logmessages-generation-required" unless="logmessages-generation-not-required">
+ <target name="generate-logmessages" depends="compile-logmessages-generator" if="generate.logmessage.sources">
<mkdir dir="${generated-logmessages-dir}"/>
<path id="logmessages.path">
Modified: qpid/trunk/qpid/java/common/build-generate-sources.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build-generate-sources.xml?rev=1527353&r1=1527352&r2=1527353&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build-generate-sources.xml (original)
+++ qpid/trunk/qpid/java/common/build-generate-sources.xml Sun Sep 29 17:16:44 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/common/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build.xml?rev=1527353&r1=1527352&r2=1527353&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Sun Sep 29 17:16:44 2013
@@ -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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org