Author: sebb
Date: Sun Mar 4 14:27:52 2007
New Revision: 514487
URL: http://svn.apache.org/viewvc?view=rev&rev=514487
Log:
Add task to allow fetching of current revision from SVN
[Requires svnant jars to be downloaded to lib/opt]
Modified:
jakarta/jmeter/branches/rel-2-2/build.xml
Modified: jakarta/jmeter/branches/rel-2-2/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.xml?view=diff&rev=514487&r1=514486&r2=514487
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/build.xml Sun Mar 4 14:27:52 2007
@@ -383,9 +383,15 @@
<!--
JMeter version
This is overridden for formal releases.
- Should be the SVN branch otherwise.
-->
- <property name="jmeter.version" value="2.2.${DSTAMP}"/>
+ <property name="jmeter.version" value="2.2.${DSTAMP}"/>
+ <echo>jmeter.version = ${jmeter.version}</echo>
+ </target>
+
+ <!-- Get version from SVN status -->
+ <target name="init-svnVersion" depends="svnCheck">
+ <property name="jmeter.version" value="r${svnCheck.revision}"/>
+ <echo>jmeter.version = ${jmeter.version}</echo>
</target>
<target name="init" depends="check-libs,report-missing-libs,init-version">
@@ -1648,5 +1654,20 @@
<report format="frames" todir="reports"/>
</junitreport>
</target>
-
-</project>
+
+ <path id="svn.classpath">
+ <pathelement location="${lib.opt}/svnant.jar"/>
+ <pathelement location="${lib.opt}/svnClientAdapter.jar"/>
+ <pathelement location="${lib.opt}/svnjavahl.jar"/>
+ </path>
+ <taskdef resource="svntask.properties" classpathref="svn.classpath"/>
+ <target name="svnCheck" description="--> description">
+ <svn javahl="true">
+ <status path="build.xml"
+ textStatusProperty="testStatus.textStatus"
+ propStatusProperty="testStatus.propStatus"
+ lastChangedRevisionProperty="testStatus.lastCommitRevision"
+ revisionProperty="svnCheck.revision"/>
+ </svn>
+ </target>
+</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
