Re: [Freeciv-Dev] [patch #2843] Make secfile reading cope with \r\n and \n\r line endings on all platforms

2011-07-30 Thread Jacob Nevins
Marko Lindqvist writes:
 On 29 July 2011 02:30, Jacob Nevins no-reply.invalid-addr...@gna.org wrote:
 Attached patch makes secfile reading treat \r\n and \n\r line endings the
 same as \n, if it sees them (e.g., if opening a file with DOS/Windows line
 endings on Unix).
 
  I don't know if there's anything in this patch making Windows testing
 necessary, but I made a Windows build with it regardless for your
 testing pleasure.
 
  http://www.cazfi.net/~cazfi/fcwintest/freeciv-2.3.0-RC1+-r20033.zip

Thanks, that was useful. Detailed results in bug digest.

Did this build also contain the uncommitted patch for bug #18396 (the
bzip2 one, file #13687)? This presumably affects whether the files are
opened in text or binary mode (although I haven't checked thoroughly).
I don't think it should materially affect the conclusions, but it would
be good to know.

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] [patch #2843] Make secfile reading cope with \r\n and \n\r line endings on all platforms

2011-07-30 Thread Marko Lindqvist
On 30 July 2011 16:53, Jacob Nevins
0jacobnk.fc...@chiark.greenend.org.uk wrote:
 Marko Lindqvist writes:
 On 29 July 2011 02:30, Jacob Nevins no-reply.invalid-addr...@gna.org wrote:
 Attached patch makes secfile reading treat \r\n and \n\r line endings the
 same as \n, if it sees them (e.g., if opening a file with DOS/Windows line
 endings on Unix).

  I don't know if there's anything in this patch making Windows testing
 necessary, but I made a Windows build with it regardless for your
 testing pleasure.

  http://www.cazfi.net/~cazfi/fcwintest/freeciv-2.3.0-RC1+-r20033.zip

 Thanks, that was useful. Detailed results in bug digest.

 Did this build also contain the uncommitted patch for bug #18396 (the
 bzip2 one, file #13687)? This presumably affects whether the files are
 opened in text or binary mode (although I haven't checked thoroughly).
 I don't think it should materially affect the conclusions, but it would
 be good to know.

 No, I considered having them both patches in that build, but thought
that you probably want to test effects of single patch without
worrying what the other patch does to results. I can make another
build with both patches in, of course, if you want to test that.


 - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] [patch #2843] Make secfile reading cope with \r\n and \n\r line endings on all platforms

2011-07-30 Thread Marko Lindqvist
On 30 July 2011 17:06, Marko Lindqvist cazf...@gmail.com wrote:
 On 30 July 2011 16:53, Jacob Nevins
 0jacobnk.fc...@chiark.greenend.org.uk wrote:
 Marko Lindqvist writes:
 On 29 July 2011 02:30, Jacob Nevins no-reply.invalid-addr...@gna.org 
 wrote:
 Attached patch makes secfile reading treat \r\n and \n\r line endings the
 same as \n, if it sees them (e.g., if opening a file with DOS/Windows line
 endings on Unix).

  I don't know if there's anything in this patch making Windows testing
 necessary, but I made a Windows build with it regardless for your
 testing pleasure.

  http://www.cazfi.net/~cazfi/fcwintest/freeciv-2.3.0-RC1+-r20033.zip

 Thanks, that was useful. Detailed results in bug digest.

 Did this build also contain the uncommitted patch for bug #18396 (the
 bzip2 one, file #13687)? This presumably affects whether the files are
 opened in text or binary mode (although I haven't checked thoroughly).
 I don't think it should materially affect the conclusions, but it would
 be good to know.

  No, I considered having them both patches in that build, but thought
 that you probably want to test effects of single patch without
 worrying what the other patch does to results. I can make another
 build with both patches in, of course, if you want to test that.

 Uploading...

 btw. I plan to make only builds like these (freeciv in one zip) in
the future. As you are the only one who has ever successfully used
these builds, would you mind writing short instructions how you setup
your system, including l10n stuff? I could only give untested theories
about the setup myself. Forum thread about my builds is one place
where such instructions should exist, so feel free to comment there
directly.


 - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] [patch #2843] Make secfile reading cope with \r\n and \n\r line endings on all platforms

2011-07-30 Thread Jacob Nevins
 Did this build also contain the uncommitted patch for bug #18396 (the
 bzip2 one, file #13687)?

  No, I considered having them both patches in that build, but thought
 that you probably want to test effects of single patch without
 worrying what the other patch does to results. I can make another
 build with both patches in, of course, if you want to test that.
 
  Uploading...

OK, will try this next time I'm in Windows.
(Feel free to delete the previous build from cazfi.net, BTW; I have a
copy.)

  btw. I plan to make only builds like these (freeciv in one zip) in
 the future. As you are the only one who has ever successfully used
 these builds, would you mind writing short instructions how you setup
 your system, including l10n stuff? I could only give untested theories
 about the setup myself. Forum thread about my builds is one place
 where such instructions should exist, so feel free to comment there
 directly.

Sure. Do you yet have a public example of such a build that I can cite?

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] [patch #2843] Make secfile reading cope with \r\n and \n\r line endings on all platforms

2011-07-30 Thread Marko Lindqvist
On 30 July 2011 17:25, Jacob Nevins
0jacobnk.fc...@chiark.greenend.org.uk wrote:
  btw. I plan to make only builds like these (freeciv in one zip) in
 the future. As you are the only one who has ever successfully used
 these builds, would you mind writing short instructions how you setup
 your system, including l10n stuff? I could only give untested theories
 about the setup myself. Forum thread about my builds is one place
 where such instructions should exist, so feel free to comment there
 directly.

 Sure. Do you yet have a public example of such a build that I can cite?

 2.3.0-RC2 build will probably be the first one, unless official build
by cproc turns up before I've made mine.


 - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] [patch #2843] Make secfile reading cope with \r\n and \n\r line endings on all platforms

2011-07-29 Thread Marko Lindqvist
On 29 July 2011 02:30, Jacob Nevins no-reply.invalid-addr...@gna.org wrote:

 Attached patch makes secfile reading treat \r\n and \n\r line endings the
 same as \n, if it sees them (e.g., if opening a file with DOS/Windows line
 endings on Unix).

 Tested on Unix. I haven't checked what happens with a Windows build of
 Freeciv opening a Unix file in text mode; it depends if fgets() treats the
 lone \n as a line ending.

 This probably wants some testing...

 I don't know if there's anything in this patch making Windows testing
necessary, but I made a Windows build with it regardless for your
testing pleasure.

 http://www.cazfi.net/~cazfi/fcwintest/freeciv-2.3.0-RC1+-r20033.zip


 - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev