Hey, good point, I follow you... if the cvs client
auto-converts the "expected" files, then they won't
match the <fixcrlf>'d files. Hmm... maybe we should
just change the unit test to read the files (using
<loadfile> with a <striplinebreaks> filter) into
properties and compare those rather than using
FileUtils.contentEquals(...)? Any other ideas?
-Matt
--- Peter Reilly <[EMAIL PROTECTED]> wrote:
> Actually, I have had a quick look at the changes you
> made.
> I do not believe that they will work on windows with
> a dos style cvs client.
>
> For example:
> the xml target is now:
> <target name="createMd5">
> <checksum file="../asf-logo.gif" fileext=".MD5"
> />
> <fixcrlf eol="lf" srcdir=".."
> includes="asf-logo.gif.MD5" />
> </target>
> the test is:
>
> public void testCreateMd5() throws IOException {
> FileUtils fileUtils =
> FileUtils.newFileUtils();
> executeTarget("createMd5");
>
>
assertTrue(fileUtils.contentEquals(project.resolveFile("expected/asf-logo.gif.md5"),
>
> project.resolveFile("../asf-logo.gif.MD5")));
> }
>
> The expected file is "expected/asf-logo.gif.md5".
> There will be a one
> character
> difference between the size of the file with dos
> line ending and a file
> with unix (or mac) line
> endings. With the change you make, the test will not
> compare a file with
> dos line endings
> to one with unix lineending and so will fail.
>
> Peter
>
>
> Matt Benson wrote:
>
> >--- Stefan Bodewig <[EMAIL PROTECTED]> wrote:
> >
> >
> >
> >>On Wed, 08 Dec 2004, Peter Reilly
> >><[EMAIL PROTECTED]> wrote:
> >>
> >>
> >>
> >>>I think it is more a cvs client issue. Some cvs
> >>>
> >>>
> >>clients on windows
> >>
> >>
> >>>convert to dos endings (correct behaviour for
> >>>
> >>>
> >>non-binary files) and
> >>
> >>
> >>>some do not (cygwin cvs client I think does not).
> >>>
> >>>
> >>Still, if it worked before ...
> >>
> >>
> >>
> >Hmmm... Peter is right, I do use the cygwin cvs
> client
> >on Windows. But again, if it worked before... if
> it's
> >a cygwin issue it possibly is dependent on the fact
> >that I have un*x selected as my default filetype.
> >Anyway...
> >
> >-Matt
> >
> >
> >
> >>Stefan
> >>
> >>
> >>
> >>
>
>---------------------------------------------------------------------
> >
> >
> >>To unsubscribe, e-mail:
> >>[EMAIL PROTECTED]
> >>For additional commands, e-mail:
> >>[EMAIL PROTECTED]
> >>
> >>
> >>
> >>
> >
> >
> >
> >
> >__________________________________
> >Do you Yahoo!?
> >Meet the all-new My Yahoo! - Try it today!
> >http://my.yahoo.com
> >
> >
> >
>
>---------------------------------------------------------------------
> >To unsubscribe, e-mail:
> [EMAIL PROTECTED]
> >For additional commands, e-mail:
> [EMAIL PROTECTED]
> >
> >
> >
> >
> >
>
>
>
---------------------------------------------------------------------
> To unsubscribe, e-mail:
> [EMAIL PROTECTED]
> For additional commands, e-mail:
> [EMAIL PROTECTED]
>
>
__________________________________
Do you Yahoo!?
The all-new My Yahoo! - Get yours free!
http://my.yahoo.com
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
