summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2010-06-14 13:13:43 +0000
committerMartin Ritchie <ritchiem@apache.org>2010-06-14 13:13:43 +0000
commit41d44830e874f191ec273352483989ec7ee96f14 (patch)
tree572a8f83789dbb5160b466bc15d8d3abb784bc77 /java
parent1b928b56116fb2df6119fdb70fb47fdc70b0238e (diff)
downloadqpid-python-41d44830e874f191ec273352483989ec7ee96f14.tar.gz
QPID-2652 : Update client build.xml to use local property for genration, this will prevent the framing being rebuilt on every ant run.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@954438 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/common/build.xml11
1 files changed, 5 insertions, 6 deletions
diff --git a/java/common/build.xml b/java/common/build.xml
index 1ca5913899..f2f85fc634 100644
--- a/java/common/build.xml
+++ b/java/common/build.xml
@@ -24,15 +24,14 @@
<import file="../module.xml"/>
- <property name="gentools.home" location="${project.root}/../gentools" />
<property name="generated.package" value="org/apache/qpid/framing" />
- <property name="generated.dir" location="${module.precompiled}/${generated.package}" />
+ <property name="framing.generated.dir" location="${module.precompiled}/${generated.package}" />
<property name="qpidbuildversion.java" location="${module.precompiled}/org/apache/qpid/QpidBuildVersion.java" />
<property name="xml.spec.dir" location="${project.root}/../specs" />
<property name="xml.spec.deps" value="amqp.0-8.xml amqp.0-9.xml amqp0-9-1.stripped.xml" />
<property name="xml.spec.list" value='"${xml.spec.dir}/amqp.0-8.xml" "${xml.spec.dir}/amqp.0-9.xml" "${xml.spec.dir}/amqp0-9-1.stripped.xml"' />
- <property name="gentools.timestamp" location="${generated.dir}/gentools.timestamp" />
- <property name="jython.timestamp" location="${generated.dir}/jython.timestamp" />
+ <property name="gentools.timestamp" location="${framing.generated.dir}/gentools.timestamp" />
+ <property name="jython.timestamp" location="${framing.generated.dir}/jython.timestamp" />
<target name="check_jython_deps">
<uptodate property="jython.notRequired" targetfile="${jython.timestamp}">
@@ -63,9 +62,9 @@
</target>
<target name="gentools" depends="compile_gentools,check_gentool_deps" unless="gentools.notRequired">
- <mkdir dir="${generated.dir}"/>
+ <mkdir dir="${framing.generated.dir}"/>
<java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.home}/src" failonerror="true">
- <arg line='-j -o "${generated.dir}" -t "${project.root}/common/templates" ${xml.spec.list}'/>
+ <arg line='-j -o "${framing.generated.dir}" -t "${project.root}/common/templates" ${xml.spec.list}'/>
<classpath>
<pathelement path="${gentools.home}/src" />
<fileset dir="${gentools.home}/lib">