diff options
| -rwxr-xr-x | bin/release.sh | 2 | ||||
| -rw-r--r-- | java/common/build.xml | 26 | ||||
| -rw-r--r-- | java/management/eclipse-plugin/build.xml | 16 | ||||
| -rw-r--r-- | java/module.xml | 24 |
4 files changed, 26 insertions, 42 deletions
diff --git a/bin/release.sh b/bin/release.sh index 012829976e..084e999362 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -193,7 +193,7 @@ fi if [ "JAVA" == "$JAVA" ] ; then pushd qpid-${VER}/java - ant build release release-bin + ant build release release-bin -Dsvnversion.output=${REV} popd cp qpid-${VER}/java/release/*.tar.gz artifacts/qpid-java-${VER}.tar.gz diff --git a/java/common/build.xml b/java/common/build.xml index bb31061322..44cc19aa07 100644 --- a/java/common/build.xml +++ b/java/common/build.xml @@ -77,31 +77,7 @@ <touch file="${gentools.timestamp}" /> </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="qpid.svnversion"> - <arg line="."/> - </exec> - <condition property="version.stale"> - <not> - <equals arg1="${qpid.svnversion}" arg2="${old.qpid.svnversion}"/> - </not> - </condition> - </target> - - <target name="version" depends="check-version" if="version.stale"> - <!-- Write the version.properties out. --> - <echo file="${version.file}" append="true"> - qpid.svnversion=${qpid.svnversion} - qpid.name=${project.name} - qpid.version=${project.version} - </echo> - </target> - - <target name="precompile" depends="gentools,jython,version"/> + <target name="precompile" depends="gentools,jython,create-version"/> <target name="bundle" depends="bundle-tasks"/> </project> diff --git a/java/management/eclipse-plugin/build.xml b/java/management/eclipse-plugin/build.xml index 51587c7984..3361ae362c 100644 --- a/java/management/eclipse-plugin/build.xml +++ b/java/management/eclipse-plugin/build.xml @@ -50,22 +50,6 @@ </copy> </target> - <target name="create-version" description="Create the version file"> - - <exec executable="svnversion" spawn="false" failifexecutionfails="false" - dir="." outputproperty="svnversion"> - <arg line="."/> - </exec> - - <!-- Write the version.properties out. --> - <propertyfile file="${module.classes}/qpidversion.properties"> - <entry key="qpid.version" value="${project.version}"/> - <entry key="qpid.svnversion" value="${svnversion}"/> - <entry key="qpid.name" value="${project.name}"/> - </propertyfile> - - </target> - <target name="precompile" depends="copy-plugin-files, create-version" /> <!-- Override imported module.xml release-bin target --> 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> |