[Spice-devel] [PATCH spice] update visual studio project file
Alon Levy
alevy at redhat.com
Wed Apr 18 06:00:58 PDT 2012
On Wed, Apr 18, 2012 at 07:30:19AM -0500, Aric Stewart wrote:
> As a test I have found that I can convert the line-endings to linux style
> and Visual Studio 2008 still handles the file without issue. Of course if I
> or a future developer make project changes in VC and then save the project
> it will by default covert the line endings back to MSDOS format.
In this case we could actually ask everyone to commit as linux eols,
using the git config options:
core.safecrlf=1
core.eol=LF
Haven't tried this yet.
I'm going to push a patch turning vcproj to linux EOLs and then your
patch.
>
> -aric
>
> On 4/18/12 6:48 AM, Aric Stewart wrote:
> >I wonder if the process of having to include the patch as text into my
> >e-mail is what is munging the line endings.
> >
> >I could check if VC can handle a project file with linux style line
> >endings and then we could normalize to linux line endings and see if
> >that helps...
> >
> >-aric
> >
> >On 4/18/12 6:17 AM, Alon Levy wrote:
> >>On Tue, Apr 17, 2012 at 06:24:18PM -0500, Aric Stewart wrote:
> >>>Note, there may be line-ending issues here is we are not careful.
> >>>This file is a msdos formatted file.
> >>>
> >>>There was some inconsistencies in those line-ending that I have
> >>>normalized.
> >>
> >>Aric, this doesn't apply at all, I get a gazillion merge conflicts. It
> >>looks like the patch doesn't include CRLF at all, just CR. I'll try
> >>applying it anyway, with dos2unix / unix2dos maybe it would work.
> >>
> >>>
> >>>Signed-off-by: Aric Stewart<aric at codeweavers.com>
> >>>---
> >>>client/windows/redc.vcproj | 84
> >>>++++++++++++++++++++++----------------------
> >>>1 files changed, 42 insertions(+), 42 deletions(-)
> >>>
> >>>diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
> >>>index f27c7ce..df4c77e 100644
> >>>--- a/client/windows/redc.vcproj
> >>>+++ b/client/windows/redc.vcproj
> >>>@@ -49,8 +49,8 @@
> >>><Tool
> >>>Name="VCCLCompilerTool"
> >>>Optimization="0"
> >>>-
> >>>AdditionalIncludeDirectories=".;..;$(SPICE_PROTOCOL_DIR);..\..\common;..\..\common\win;"..\..\common\win\my_getopt-1.5";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\pixman-1";"$(SPICE_LIBS)\include\CEGUI-0.6.2";"$(SPICE_LIBS)\include\CxImage""
> >>>
> >>>-
> >>>PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;RED_DEBUG;_WIN32_WINNT=0x0500;USE_GUI;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
> >>>
> >>>+
> >>>AdditionalIncludeDirectories=".;..;"$(SPICE_PROTOCOL_DIR)";"$(SPICE_COMMON_DIR)";"$(SPICE_COMMON_DIR)\common";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\pixman-1";"$(SPICE_LIBS)\include\CEGUI-0.6.2";"$(SPICE_LIBS)\include\CxImage""
> >>>
> >>>+
> >>>PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;RED_DEBUG;_WIN32_WINNT=0x0500;USE_GUI;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC;HAVE_STRING_H"
> >>>
> >>>MinimalRebuild="false"
> >>>BasicRuntimeChecks="3"
> >>>RuntimeLibrary="1"
> >>>@@ -108,8 +108,8 @@
> >>></Configuration>
> >>><Configuration
> >>>Name="Debug|x64"
> >>>-
> >>>OutputDirectory="$(REDC_BUILD_DIR)$(PlatformName)\$(ConfigurationName)"
> >>>-
> >>>IntermediateDirectory="$(REDC_BUILD_DIR)$(PlatformName)\$(ConfigurationName)"
> >>>
> >>>+
> >>>OutputDirectory="$(REDC_BUILD_DIR)$(PlatformName)\$(ConfigurationName)"
> >>>+
> >>>IntermediateDirectory="$(REDC_BUILD_DIR)$(PlatformName)\$(ConfigurationName)"
> >>>
> >>>ConfigurationType="1"
> >>>CharacterSet="1"
> >>>>
> >>>@@ -137,8 +137,8 @@
> >>><Tool
> >>>Name="VCCLCompilerTool"
> >>>Optimization="0"
> >>>-
> >>>AdditionalIncludeDirectories=".;..;$(SPICE_PROTOCOL_DIR);..\..\common;..\..\common\win;"..\..\common\win\my_getopt-1.5";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\pixman-1";"$(SPICE_LIBS)\include\CEGUI-0.6.2";"$(SPICE_LIBS)\include\CxImage""
> >>>
> >>>-
> >>>PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;RED_DEBUG;_WIN32_WINNT=0x0500;USE_GUI;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
> >>>
> >>>+
> >>>AdditionalIncludeDirectories=".;..;"$(SPICE_PROTOCOL_DIR)";"$(SPICE_COMMON_DIR)";"$(SPICE_COMMON_DIR)\common";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\pixman-1";"$(SPICE_LIBS)\include\CEGUI-0.6.2";"$(SPICE_LIBS)\include\CxImage""
> >>>
> >>>+
> >>>PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;RED_DEBUG;_WIN32_WINNT=0x0500;USE_GUI;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC;HAVE_STRING_H"
> >>>
> >>>MinimalRebuild="false"
> >>>BasicRuntimeChecks="3"
> >>>RuntimeLibrary="1"
> >>>@@ -220,8 +220,8 @@
> >>>/>
> >>><Tool
> >>>Name="VCCLCompilerTool"
> >>>-
> >>>AdditionalIncludeDirectories=".;..;$(SPICE_PROTOCOL_DIR);..\..\common;..\..\common\win;"..\..\common\win\my_getopt-1.5";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\pixman-1";"$(SPICE_LIBS)\include\CEGUI-0.6.2";"$(SPICE_LIBS)\include\CxImage""
> >>>
> >>>-
> >>>PreprocessorDefinitions="WIN32;_WINDOWS;_WIN32_WINNT=0x0500;USE_GUI;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
> >>>
> >>>+
> >>>AdditionalIncludeDirectories=".;..;"$(SPICE_PROTOCOL_DIR)";"$(SPICE_COMMON_DIR)";"$(SPICE_COMMON_DIR)\common";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\pixman-1";"$(SPICE_LIBS)\include\CEGUI-0.6.2";"$(SPICE_LIBS)\include\CxImage""
> >>>
> >>>+
> >>>PreprocessorDefinitions="WIN32;_WINDOWS;_WIN32_WINNT=0x0500;USE_GUI;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC;HAVE_STRING_H"
> >>>
> >>>RuntimeLibrary="0"
> >>>UsePrecompiledHeader="0"
> >>>WarningLevel="3"
> >>>@@ -249,7 +249,7 @@
> >>>SubSystem="2"
> >>>OptimizeReferences="2"
> >>>EnableCOMDATFolding="2"
> >>>- RandomizedBaseAddress="2"
> >>>+ RandomizedBaseAddress="2"
> >>>DataExecutionPrevention="0"
> >>>TargetMachine="1"
> >>>/>
> >>>@@ -277,8 +277,8 @@
> >>></Configuration>
> >>><Configuration
> >>>Name="Release|x64"
> >>>-
> >>>OutputDirectory="$(REDC_BUILD_DIR)$(PlatformName)\$(ConfigurationName)"
> >>>-
> >>>IntermediateDirectory="$(REDC_BUILD_DIR)$(PlatformName)\$(ConfigurationName)"
> >>>
> >>>+
> >>>OutputDirectory="$(REDC_BUILD_DIR)$(PlatformName)\$(ConfigurationName)"
> >>>+
> >>>IntermediateDirectory="$(REDC_BUILD_DIR)$(PlatformName)\$(ConfigurationName)"
> >>>
> >>>ConfigurationType="1"
> >>>UseOfMFC="0"
> >>>CharacterSet="1"
> >>>@@ -303,8 +303,8 @@
> >>>/>
> >>><Tool
> >>>Name="VCCLCompilerTool"
> >>>-
> >>>AdditionalIncludeDirectories=".;..;$(SPICE_PROTOCOL_DIR);..\..\common;..\..\common\win;"..\..\common\win\my_getopt-1.5";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\pixman-1";"$(SPICE_LIBS)\include\CEGUI-0.6.2";"$(SPICE_LIBS)\include\CxImage""
> >>>
> >>>-
> >>>PreprocessorDefinitions="WIN32;_WINDOWS;_WIN32_WINNT=0x0500;USE_GUI;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
> >>>
> >>>+
> >>>AdditionalIncludeDirectories=".;..;"$(SPICE_PROTOCOL_DIR)";"$(SPICE_COMMON_DIR)";"$(SPICE_COMMON_DIR)\common";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\pixman-1";"$(SPICE_LIBS)\include\CEGUI-0.6.2";"$(SPICE_LIBS)\include\CxImage""
> >>>
> >>>+
> >>>PreprocessorDefinitions="WIN32;_WINDOWS;_WIN32_WINNT=0x0500;USE_GUI;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC;HAVE_STRING_H"
> >>>
> >>>RuntimeLibrary="0"
> >>>UsePrecompiledHeader="0"
> >>>WarningLevel="3"
> >>>@@ -333,7 +333,7 @@
> >>>SubSystem="2"
> >>>OptimizeReferences="2"
> >>>EnableCOMDATFolding="2"
> >>>- RandomizedBaseAddress="2"
> >>>+ RandomizedBaseAddress="2"
> >>>DataExecutionPrevention="0"
> >>>TargetMachine="17"
> >>>/>
> >>>@@ -377,7 +377,7 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\canvas_utils.c"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\canvas_utils.c"
> >>>>
> >>></File>
> >>><File
> >>>@@ -413,19 +413,19 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\generated_demarshallers.cpp"
> >>>+ RelativePath="..\generated_demarshallers.c"
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\generated_demarshallers1.cpp"
> >>>+ RelativePath="..\generated_demarshallers1.c"
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\generated_marshallers.cpp"
> >>>+ RelativePath="..\generated_marshallers.c"
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\generated_marshallers1.cpp"
> >>>+ RelativePath="..\generated_marshallers1.c"
> >>>>
> >>></File>
> >>><File
> >>>@@ -453,11 +453,15 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\lines.c"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\lines.c"
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\lz.c"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\log.c"
> >>>+ >
> >>>+ </File>
> >>>+ <File
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\lz.c"
> >>>>
> >>></File>
> >>><File
> >>>@@ -465,7 +469,11 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\mem.c"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\marshaller.c"
> >>>+ >
> >>>+ </File>
> >>>+ <File
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\mem.c"
> >>>>
> >>></File>
> >>><File
> >>>@@ -529,7 +537,7 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\pixman_utils.c"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\pixman_utils.c"
> >>>>
> >>></File>
> >>><File
> >>>@@ -553,7 +561,7 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\quic.c"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\quic.c"
> >>>>
> >>></File>
> >>><File
> >>>@@ -605,7 +613,7 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\region.c"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\region.c"
> >>>>
> >>></File>
> >>><File
> >>>@@ -613,7 +621,7 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\rop3.c"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\rop3.c"
> >>>>
> >>></File>
> >>><File
> >>>@@ -633,7 +641,7 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\ssl_verify.c"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\ssl_verify.c"
> >>>>
> >>></File>
> >>><File
> >>>@@ -671,11 +679,11 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\client_net_socket.h"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\client_demarshallers.h"
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\common.h"
> >>>+ RelativePath="..\client_net_socket.h"
> >>>>
> >>></File>
> >>><File
> >>>@@ -695,10 +703,6 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\demarshallers.h"
> >>>- >
> >>>- </File>
> >>>- <File
> >>>RelativePath="..\display_channel.h"
> >>>>
> >>></File>
> >>>@@ -715,11 +719,11 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\gdi_canvas.h"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\gdi_canvas.h"
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\win\my_getopt-1.5\getopt.h"
> >>>+ RelativePath=".\getopt.h"
> >>>>
> >>></File>
> >>><File
> >>>@@ -763,10 +767,6 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\marshaller.c"
> >>>- >
> >>>- </File>
> >>>- <File
> >>>RelativePath="..\menu.h"
> >>>>
> >>></File>
> >>>@@ -867,7 +867,7 @@
> >>>>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\common\ssl_verify.h"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\common\ssl_verify.h"
> >>>>
> >>></File>
> >>><File
> >>>@@ -910,7 +910,7 @@
> >>></File>
> >>></Filter>
> >>><File
> >>>- RelativePath="..\..\spice.proto"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\spice.proto"
> >>>>
> >>><FileConfiguration
> >>>Name="Debug|Win32"
> >>>@@ -956,7 +956,7 @@
> >>></FileConfiguration>
> >>></File>
> >>><File
> >>>- RelativePath="..\..\spice1.proto"
> >>>+ RelativePath="$(SPICE_COMMON_DIR)\spice1.proto"
> >>>>
> >>><FileConfiguration
> >>>Name="Debug|Win32"
> >>>--
> >>>1.6.0.rc1.64.g61192
> >>>
> >>>_______________________________________________
> >>>Spice-devel mailing list
> >>>Spice-devel at lists.freedesktop.org
> >>>http://lists.freedesktop.org/mailman/listinfo/spice-devel
> >_______________________________________________
> >Spice-devel mailing list
> >Spice-devel at lists.freedesktop.org
> >http://lists.freedesktop.org/mailman/listinfo/spice-devel
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
More information about the Spice-devel
mailing list