diff options
| author | Alex Rudyy <orudyy@apache.org> | 2014-09-15 15:24:06 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2014-09-15 15:24:06 +0000 |
| commit | 9251cb4f43a277aa30b0ba0b79444b18f69f84e5 (patch) | |
| tree | a448d2eea8d4f214c9a81111fdeb71fb32d11225 /qpid/java/common/build-generate-sources.xml | |
| parent | acc5dc6df13777cd7cd399094342d5535c46f3eb (diff) | |
| download | qpid-python-9251cb4f43a277aa30b0ba0b79444b18f69f84e5.tar.gz | |
QPID-6101: Allow setting of qpid version suffix whilst building qpid common library
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1625062 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 | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/qpid/java/common/build-generate-sources.xml b/qpid/java/common/build-generate-sources.xml index 339887f3dd..cd88bfecb1 100644 --- a/qpid/java/common/build-generate-sources.xml +++ b/qpid/java/common/build-generate-sources.xml @@ -27,7 +27,6 @@ <isset property="generated-amqp-0-8-dir"/> <isset property="generated-amqp-0-10-dir"/> <isset property="gentools.classes"/> - <isset property="version.file"/> </and> </not> </condition> @@ -50,29 +49,6 @@ <property name="gentools.src" value="${basedir}/gentools/src"/> <property name="generated.package" value="org/apache/qpid/framing" /> - <property file="${version.file}" prefix="old."/> - - <target name="check-version"> - <exec executable="svnversion" spawn="false" failifexecutionfails="false" - dir="${basedir}" outputproperty="svnversion.output"> - <arg line="."/> - </exec> - <condition property="version.stale"> - <not> - <equals arg1="${svnversion.output}" arg2="${old.qpid.svnversion}"/> - </not> - </condition> - </target> - - <target name="create-version" depends="check-version" if="version.stale"> - <echo message="Writing new qpidversion.properties file with svnversion: '${svnversion.output}'"/> - <!-- Write the version.properties out.--> - <!-- Echos exactly as shown, so leave no spaces before/after lines --> - <echo file="${version.file}" append="false">qpid.version=${project.version} -qpid.svnversion=${svnversion.output} -qpid.name=qpid -</echo> - </target> <target name="amqp-0-10-generation" if="generate.protocol.sources"> <mkdir dir="${generated-amqp-0-10-dir}"/> @@ -110,6 +86,6 @@ qpid.name=qpid </java> </target> - <target name="generate-sources" depends="amqp-0-8-generation, amqp-0-10-generation, create-version"/> + <target name="generate-sources" depends="amqp-0-8-generation, amqp-0-10-generation"/> </project> |