diff options
| author | Robert Gemmell <robbie@apache.org> | 2009-12-10 10:26:06 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2009-12-10 10:26:06 +0000 |
| commit | 92120cf29e1ca14310cc92c6f051248a89780fe6 (patch) | |
| tree | 640e453d4afedc3db66ee448f30315c06a924bfb /java/module.xml | |
| parent | ee918537e3adcfe6d6e9b7b15a1f748aaf167efc (diff) | |
| download | qpid-python-92120cf29e1ca14310cc92c6f051248a89780fe6.tar.gz | |
Move generation of qpidversion.properties files to a shared definition in module.xml, update property name used during generation to prevent circularly defined properties when svnversion isnt available on the path. Update release.sh script to override the svnversion output property when using exported files
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@889173 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/module.xml')
| -rw-r--r-- | java/module.xml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/java/module.xml b/java/module.xml index 1cd1afc0c3..6b5840737c 100644 --- a/java/module.xml +++ b/java/module.xml @@ -596,4 +596,28 @@ </cobertura-report> </target> + <property name="version.file" location="${module.classes}/qpidversion.properties"/> + <property file="${version.file}" prefix="old."/> + + <target name="check-version"> + <exec executable="svnversion" spawn="false" failifexecutionfails="false" + dir="${project.root}" 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"> + <!-- 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=${project.name} +</echo> + </target> + </project> |