Hi,

Neil Gierman wrote:
> > > sed s/$/\r/ filename1 > filename2
> > 
> > We are sort of doing that now (the DSPOUT function). I think it's not
> > working the way it should because the head/foot files are Unix.
> 
> How about this (I don't have a linux machine to test this on right now):
> 
> +++ b/Makefile.am     2009-10-09 18:52:22.000000000 -0500
..
> -     @(cp $(srcdir)/win32/msvcproj.head $(DSP); \
> +     @(cat $(srcdir)/win32/msvcproj.head $(DSPOUT); \

Yes. I committed something similar to this just now, but also made
the awk script strip extra CR. Here's the explanation:

commit 55034294e8d2be16b5602173721e91de55103dd8
Author: Peter Stuge <pe...@stuge.se>
Date:   Sat Oct 17 02:58:53 2009 +0200

    Ensure that win32/libssh2.dsp will be generated with CRLF line endings
    
    First, win32/msvcproj.{head,foot} are now committed with CRLF line endings,
    and .gitattributes specifies that these should not be changed on checkout or
    commit. These are win32 files so it makes sense to store them with native
    line endings.
    
    Second, the rules for generating libssh2.dsp and libssh2.vcproj are changed
    so that the full file contents passes through awk, which strips all CR and
    then prints each line with one CRLF line ending. Stripping CR is important
    to avoid CRCRLF in case the input already comes with CRLF.


I have no way of testing this, so I appreciate your feedback.


//Peter
_______________________________________________
libssh2-devel http://cool.haxx.se/cgi-bin/mailman/listinfo/libssh2-devel

Reply via email to