Re: win-setup.sh text mode

[Gerald Combs <gerald () wireshark org>]

Pascal Quantin wrote:
> Hi all,
>
> since I updated my trunk tree to revision 31528, I cannot compile 
> Wireshark on my Windows box (WinXP, MSVC2008SP1, cygwin 1.7.1). I get 
> the following error:
> C:\wireshark\trunk>nmake -f Makefile.nmake all
>
> Microsoft (R) Program Maintenance Utility Version 9.00.30729.01
> Copyright (C) Microsoft Corporation.  All rights reserved.
>
> /cygdrive/c/wireshark/trunk2/tools/win-setup.sh: line 4: $'\r': command 
> not found
> /cygdrive/c/wireshark/trunk2/tools/win-setup.sh: line 12: $'\r': command 
> not found
> /cygdrive/c/wireshark/trunk2/tools/win-setup.sh: line 27: syntax error 
> near unexpected token `$'{\r''
> 'cygdrive/c/wireshark/trunk2/tools/win-setup.sh: line 27: `err_exit () {
> ? Wireshark Libraries not up-to-date ?
> ? Do you need to run nmake -f Makefile.nmake setup ?
>
> NMAKE : fatal error U1077: 'exit' : code retour '0x1'
> Stop.
>
> I get the same thing with a clean checkout.
> I had to manually convert win-setup.sh file from dos encoding to unix 
> encoding to get things working again. Is anyone else experiencing the 
> same issue ?

That's my fault. I added the svn:executable and svn:eol-style properties
to match win{32|64}-setup.sh. In theory they should all have identical
line ending styles. If you remove tools/win*-setup.sh and update, what
line ending style does each file have?
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe