You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by Sangal_ak04 <ar...@galileo.com> on 2008/08/25 20:53:39 UTC
cvstagdiff -- rdiff with -kk option in ANT
Hi All,
I want to generate differences between two given tags (i.e. a start tag and
end tag).
Currently I'm using the following code in build.xml:
....
some code here
......
<target name="-tagdiff" if="is.tag.type">
<cvstagdiff
cvsRoot=":pserver:gigabuild@giga.repos-cvs.com:/mnt/cvs/cvsroot/${repository}"
destfile="xml/${component}-diff.xml"
package="${module}"
startTag="${start.tag}"
endTag="${end.tag}"
passfile=".cvspass">
<commandline>
<argument value="-kk"/>
</commandline>
</cvstagdiff>
<style in="xml/${component}-diff.xml"
out="report_${start.tag}_${end.tag}/${product}/${component}-diff.html"
style="tagdiff.xsl">
</style>
</target>
......
some code here
....
I'm getting an error mesg while running "ant" using this build.xml. It's
saying... unknown "-k" option.
Can't I use these lines:
<commandline>
<argument value="-kk"/>
</commandline>
with "cvstagdiff" ???
NOTE:
1) -kk option is used with rdiff command to ignore CVS's own variable while
comparing files with two diff versions i.e. it just checks changes if there
are any in the actual code body (instead of any CVS variable's expanded
value within the code's comment area).
2) Value for start.tag and end.tag are coming from a property file i.e.
build.properties
3) When I'm removing the above 3 lines, diff reports are generating good but
showing files has changes even if the changes are just due to CVS's own
variable expansion.
4) I have tried the same with --kk option too.
Any help will be appreciated.
thanks-
Brgds,
Arun Sangal
303 397 6059
-----
Brgds,
Arun Sangal
SCM | 1-(303) 397 6059
arun.sangal@galileo.com
--
View this message in context: http://www.nabble.com/cvstagdiff----rdiff-with--kk-option-in-ANT-tp19149514p19149514.html
Sent from the Ant - Dev mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: cvstagdiff -- rdiff with -kk option in ANT
Posted by Sangal_ak04 <ar...@galileo.com>.
Thanks Stephen.
It looks like the issue is with $LOG$ cvs variable as when I'm running CVS
command on Linux prompt, I'm getting differences between 2 versions of a
file (only due to the keywords i.e. $Revision$, $author etc).
-kk is solving that (i.e. it's suppressing the keyword expansion while doing
the rdiff or in checkout in case you want to diff), but $LOG$ variable is
still not suppressing. It's a know bug in CVS.
arun
Stefan Bodewig wrote:
>
> On Mon, 25 Aug 2008, Sangal ak <ar...@galileo.com> wrote:
>
>> I'm getting an error mesg while running "ant" using this
>> build.xml. It's saying... unknown "-k" option.
>>
>> Can't I use these lines:
>>
>> <commandline>
>> <argument value="-kk"/>
>> </commandline>
>>
>> with "cvstagdiff" ???
>
> This leads to -kk preceede the rdiff command and this again makes the
> cvs executable complain since there is no -k option to cvs itself.
> You can see that if you run Ant in verbose mode.
>
> You might want to open an enhancement request for an attribute that
> made the task specify -kk itself (if there isn't already one).
>
> As a workaround, if you use package="-kk ${module}" Ant will pass the
> -kk option down to rdiff (and it should work, untested).
>
> Stefan
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
>
>
>
-----
Brgds,
Arun Sangal
SCM | 1-(303) 397 6059
arun.sangal@galileo.com
--
View this message in context: http://www.nabble.com/cvstagdiff----rdiff-with--kk-option-in-ANT-tp19149514p19727065.html
Sent from the Ant - Dev mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: cvstagdiff -- rdiff with -kk option in ANT
Posted by Stefan Bodewig <bo...@apache.org>.
On Mon, 25 Aug 2008, Sangal ak <ar...@galileo.com> wrote:
> I'm getting an error mesg while running "ant" using this
> build.xml. It's saying... unknown "-k" option.
>
> Can't I use these lines:
>
> <commandline>
> <argument value="-kk"/>
> </commandline>
>
> with "cvstagdiff" ???
This leads to -kk preceede the rdiff command and this again makes the
cvs executable complain since there is no -k option to cvs itself.
You can see that if you run Ant in verbose mode.
You might want to open an enhancement request for an attribute that
made the task specify -kk itself (if there isn't already one).
As a workaround, if you use package="-kk ${module}" Ant will pass the
-kk option down to rdiff (and it should work, untested).
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org