Re: [xml] EOL consistency

[Florent Guiliani <flgu 4js com>]

Daniel Veillard a écrit :
> On Thu, Jan 24, 2008 at 04:09:23PM +0100, Florent Guiliani wrote:
>   No, no, same as the other one, a lot of backlog ...
>
> I tried to apply the patch here but only a small subset applied to current
> trunk:
>
> paphio:~/XML -> patch -p1 < consistenteol.patch
> patching file macos/src/XMLTestPrefix.h
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file macos/src/XMLTestPrefix.h.rej
> patching file macos/src/XMLTestPrefix2.h
> patching file win32/Makefile.msvc
> Hunk #1 FAILED at 254.
> 1 out of 1 hunk FAILED -- saving rejects to file win32/Makefile.msvc.rej
> paphio:~/XML -> 
>
>  Could you check macos/src/XMLTestPrefix.h and win32/Makefile.msvc from
> current trunk ?
>
>   thanks !
>
> Daniel

Here is the new patch applyable on trunk.

Note:

  - I've reverted the changes made to XMLTestPrefix2.h because XMLTestPrefix2.h
and XMLTestPrefix.h was correct in Macintosh EOL style (CR only)

  - the few inconsistent EOL in win32/Makefile.msvc is fixed by the patch. The
file is now fully in unix EOL style. Since win32/* files target win32 platforms
I recommand to you a "unix2dos win32/[!w]* win32/wince/*" before commiting ;)

Florent,


Index: win32/Makefile.msvc
===================================================================
--- win32/Makefile.msvc (revision 3690)
+++ win32/Makefile.msvc (working copy)
@@ -254,12 +254,12 @@
 UTILS = $(UTILS) $(BINDIR)\testThreads.exe
 !endif
 
-!if "$(VCMANIFEST)" == "1"
-_VC_MANIFEST_EMBED_EXE= if exist $  manifest mt.exe -nologo -manifest $  manifest -outputresource:$@;1
-_VC_MANIFEST_EMBED_DLL= if exist $  manifest mt.exe -nologo -manifest $  manifest -outputresource:$@;2
-!else
-_VC_MANIFEST_EMBED_EXE=
-_VC_MANIFEST_EMBED_DLL=
+!if "$(VCMANIFEST)" == "1"
+_VC_MANIFEST_EMBED_EXE= if exist $  manifest mt.exe -nologo -manifest $  manifest -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL= if exist $  manifest mt.exe -nologo -manifest $  manifest -outputresource:$@;2
+!else
+_VC_MANIFEST_EMBED_EXE=
+_VC_MANIFEST_EMBED_DLL=
 !endif
 
 all : libxml libxmla libxmladll utils
Index: macos/src/XMLTestPrefix2.h
===================================================================
--- macos/src/XMLTestPrefix2.h  (revision 3690)
+++ macos/src/XMLTestPrefix2.h  (working copy)
@@ -1,3 +1,3 @@
-int test_main(int argc, char* argv[]);
-
+int test_main(int argc, char* argv[]);
+
 #define main()         test_main(int argc, char* argv[])
\ No newline at end of file