Re: [Wireshark-dev] [Wireshark-commits] rev 39924: /trunk-1.6/ /trunk-1.6/: make-version.pl

2011-11-18 Thread Bill Meier
On 11/17/2011 8:18 PM, ger...@wireshark.org wrote: http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=revrevision=39924 User: gerald Date: 2011/11/17 05:18 PM Log: Maybe it's not a good idea to modify configure.in or config.nmake during compilation. Add a --set-svn option which only

Re: [Wireshark-dev] Win32 build from 1.6.3 source tarball: svnversion.h missing and not generated?

2011-11-18 Thread Chris Maynard
Gerald Combs gerald@... writes: I updated make-version.pl to clarify the different things that it does. It can now store the SVN revision in config.nmake, which can then be used to rebuild svnversion.h. Updating config.nmake was a lot easier than a post-commit hook since we were storing other

Re: [Wireshark-dev] [Wireshark-commits] rev 39924: /trunk-1.6/ /trunk-1.6/: make-version.pl

2011-11-18 Thread Gerald Combs
On 11/18/11 8:18 AM, Bill Meier wrote: If a build was done on Windows with the version of make-version.pl which changed config.nmake, an svn revert config.nmake will be needed. Among other things svn diff config.nmake will give an error message about inconsistent line endings until this is

Re: [Wireshark-dev] [Wireshark-commits] rev 39924: /trunk-1.6/ /trunk-1.6/: make-version.pl

2011-11-18 Thread Bill Meier
On 11/18/2011 11:55 AM, Gerald Combs wrote: Are you using a native SVN client on Windows? Yes ... I don't see the problem on Cygwin (or on Linux or OS X for that matter). I checked in changes to preserve line endings in r39938 (trunk) and r39939 (trunk-1.6).

Re: [Wireshark-dev] Win32 build from 1.6.3 source tarball: svnversion.h missing and not generated?

2011-11-18 Thread Pascal Quantin
Hi Chris, 2011/11/18 Chris Maynard chris.mayn...@gtech.com Gerald Combs gerald@... writes: I updated make-version.pl to clarify the different things that it does. It can now store the SVN revision in config.nmake, which can then be used to rebuild svnversion.h. Updating config.nmake was

Re: [Wireshark-dev] Win32 build from 1.6.3 source tarball: svnversion.h missing and not generated?

2011-11-18 Thread Gerald Combs
On 11/18/11 9:08 AM, Pascal Quantin wrote: 2011/11/18 Chris Maynard chris.mayn...@gtech.com I compiled r39937 on Windows XP SP3 (32-bit), but the plugins directory created was wireshark-gtk2\plugins\1.7.1-SVN-39921. Is this to be expected? If so, when exactly would the

Re: [Wireshark-dev] Win32 build from 1.6.3 source tarball: svnversion.h missing and not generated?

2011-11-18 Thread Chris Maynard
Gerald Combs gerald@... writes: On 11/18/11 9:08 AM, Pascal Quantin wrote: Since Gerald's commit in revision 39924 everything is back to normal (plugin folder is named 1.7.1) :) The release revision mismatch should be fixed. I can't duplicate it here, at least. In the current /trunk and