jakarta-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebb <seb...@gmail.com>
Subject Re: svn commit: r1154741 - /jakarta/jmeter/trunk/build.xml
Date Sun, 07 Aug 2011 22:59:24 GMT
On 7 August 2011 22:42, Milamber <milamber@apache.org> wrote:
> Hello,
>
> This line:
>
>                substring='REVISION = "$Revision${svn.revision} $";'/>
> is replace by svn to this:
>                substring='REVISION = "$Revision: 1154741 ${svn.revision} $";'/>
>
> When you try a ant check-version, this error appears:
> build.xml:1298: svn.revision must be same as JMeterVersion.REVISION

Drat! Should have caught that.

Hopefully now fixed.

> Milamber
>
>
>
> Le 07/08/2011 18:09, sebb@apache.org a ecrit :
>> Author: sebb
>> Date: Sun Aug  7 18:09:02 2011
>> New Revision: 1154741
>>
>> URL: http://svn.apache.org/viewvc?rev=1154741&view=rev
>> Log:
>> Add touch-version target to update JMeterVersion source file
>> Also check that values in JMeterVersion source file agree when building the distribution
>>
>> Modified:
>>     jakarta/jmeter/trunk/build.xml
>>
>> Modified: jakarta/jmeter/trunk/build.xml
>> URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=1154741&r1=1154740&r2=1154741&view=diff
>> ==============================================================================
>> --- jakarta/jmeter/trunk/build.xml (original)
>> +++ jakarta/jmeter/trunk/build.xml Sun Aug  7 18:09:02 2011
>> @@ -511,12 +511,11 @@
>>      </javac>
>>    </target>
>>
>> -  <!-- deprecated -->
>> -  <target name="update-version" unless="version.noupdate">
>> -    <echo level="info">Updating version string to "${display.version}"</echo>
>> +  <target name="touch-version" depends="init-version" description="Touch version
file to ensure it is marked as updated">
>> +    <echo level="info">Updating version file to "${DSTAMP} ${TSTAMP}"</echo>
>>      <replaceregexp file="${src.core}/org/apache/jmeter/util/JMeterVersion.java"
>> -        match="VERSION = &quot;.*?&quot;"
>> -    replace="VERSION = &quot;${display.version}&quot;"/>
>> +      match=" Updated: \d+ \d+"
>> +    replace=" Updated: ${DSTAMP} ${TSTAMP}"/>
>>    </target>
>>
>>    <target name="compile-components" depends="compile-jorphan,compile-core"
description="Compile generic (protocol-independent) components.">
>> @@ -1287,6 +1286,16 @@ run JMeter unless all the JMeter jars ar
>>      <target name="check-versions">
>>          <fail message="jmeter.version must be defined" unless="jmeter.version"/>
>>          <fail message="svn.revision must be defined" unless="svn.revision"/>
>> +        <condition property="version.match">
>> +            <resourcecontains resource="${src.core}/org/apache/jmeter/util/JMeterVersion.java"
>> +             substring='VERSION = "${jmeter.version}";'/>
>> +        </condition>
>> +        <fail message="jmeter.version must be same as JMeterVersion.VERSION"
unless="version.match"/>
>> +        <condition property="svn.match">
>> +            <resourcecontains resource="${src.core}/org/apache/jmeter/util/JMeterVersion.java"
>> +             substring='REVISION = "$Revision${svn.revision} $";'/>
>> +        </condition>
>> +     <fail message="svn.revision must be same as JMeterVersion.REVISION" unless="svn.match"/>
>>      </target>
>>
>>      <target
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
>> For additional commands, e-mail: notifications-help@jakarta.apache.org
>>
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: dev-help@jakarta.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: dev-help@jakarta.apache.org


Mime
View raw message