From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 44442A0521; Tue, 3 Nov 2020 05:05:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6CFCE9B02; Tue, 3 Nov 2020 05:05:16 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by dpdk.org (Postfix) with ESMTP id 4F8416966 for ; Tue, 3 Nov 2020 05:05:14 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1059) id 7D41C20B4905; Mon, 2 Nov 2020 20:05:12 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7D41C20B4905 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1604376312; bh=F3WDvyvsJ/PwIhhyN0kryyhXd2u35ln2XM+JhWAQ12w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=P4UWLdHI1WKouqPZW80O4HKItphih42bHODDsvlrNOVz4DPFRPwDgHbGwb9Pxp+Rz +Eh9xrG049Z49wGXsVz2TcJMeF3cZ3eAmD6LelqDpRv/tLbkUtjJKdvWm/bqhClz4m K4n6uUIiC6VBWqslbyF0GfgyySrJxp374hz7Azb4= Date: Mon, 2 Nov 2020 20:05:12 -0800 From: Narcisa Ana Maria Vasile To: Dmitry Kozlyuk Cc: dev@dpdk.org, Luca Boccassi , John Alexander Message-ID: <20201103040512.GA21662@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net> References: <20201029225505.30093-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201029225505.30093-1-dmitry.kozliuk@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [dpdk-dev] [kmods PATCH] windows: normalize line-endings X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Fri, Oct 30, 2020 at 01:55:05AM +0300, Dmitry Kozlyuk wrote: > MSBuild XML files have to use CRLF line-endings, otherwise any change > results in the whole file being rewritten with CRLF line-endings by > Visual Studio. However, it's inconvenient to have such files checked-out > with CLRF in Unix environments. > > Add suggested git configuration to top-level README, so that Unix > developers don't miss it. Remove .gitattributes, because core.autocrlf > overrides eol= attribute. Convert line-endings of the existing files in > the repository. > > Suggested-by: John Alexander > Signed-off-by: Dmitry Kozlyuk > --- > README | 5 + > windows/.gitattributes | 4 - > windows/virt2phys/virt2phys.sln | 54 ++-- > windows/virt2phys/virt2phys.vcxproj | 454 ++++++++++++++-------------- > 4 files changed, 259 insertions(+), 258 deletions(-) > delete mode 100644 windows/.gitattributes > > diff --git a/README b/README > index e71dbba..0aaf58e 100644 > --- a/README > +++ b/README > @@ -8,3 +8,8 @@ Now the preference is to contribute kernel modules to the upstream project > if possible, otherwise to host kernel code in dpdk-kmods.git. > > The license can be BSD-3-Clause or GPL-2.0. > + > +Some Windows files use have to use CRLF line-endings. > +Unix developers can configure git to get only LF on checkout: > + > + git config core.autocrlf input Doesn't the 'input' option gets you original (unmodified) line endings on checkout? If a file in the repo has CRLF endings, Unix devs will get it as-is (with CRLF), right? Regardless, this is the best option for Unix and since we're normalizing line endings for existing files, Unix devs should get LF on checkout. I will send a patch to normalize netuio as well. > diff --git a/windows/.gitattributes b/windows/.gitattributes > deleted file mode 100644 > index 13482db..0000000 > --- a/windows/.gitattributes > +++ /dev/null > @@ -1,4 +0,0 @@ > -* text=auto > - > -*.sln text eol=crlf > -*.vcxproj text eol=crlf > diff --git a/windows/virt2phys/virt2phys.sln b/windows/virt2phys/virt2phys.sln > index 0f5ecdc..ea4eec4 100644 > --- a/windows/virt2phys/virt2phys.sln > +++ b/windows/virt2phys/virt2phys.sln > @@ -1,27 +1,27 @@ > - > -Microsoft Visual Studio Solution File, Format Version 12.00 > -# Visual Studio Version 16 > -VisualStudioVersion = 16.0.29613.14 > -MinimumVisualStudioVersion = 10.0.40219.1 > -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virt2phys", "virt2phys.vcxproj", "{0EEF826B-9391-43A8-A722-BDD6F6115137}" > -EndProject > -Global > - GlobalSection(SolutionConfigurationPlatforms) = preSolution > - Debug|x64 = Debug|x64 > - Release|x64 = Release|x64 > - EndGlobalSection > - GlobalSection(ProjectConfigurationPlatforms) = postSolution > - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.ActiveCfg = Debug|x64 > - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Build.0 = Debug|x64 > - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Deploy.0 = Debug|x64 > - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.ActiveCfg = Release|x64 > - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Build.0 = Release|x64 > - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Deploy.0 = Release|x64 > - EndGlobalSection > - GlobalSection(SolutionProperties) = preSolution > - HideSolutionNode = FALSE > - EndGlobalSection > - GlobalSection(ExtensibilityGlobals) = postSolution > - SolutionGuid = {845012FB-4471-4A12-A1C4-FF7E05C40E8E} > - EndGlobalSection > -EndGlobal > + > +Microsoft Visual Studio Solution File, Format Version 12.00 > +# Visual Studio Version 16 > +VisualStudioVersion = 16.0.29613.14 > +MinimumVisualStudioVersion = 10.0.40219.1 > +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virt2phys", "virt2phys.vcxproj", "{0EEF826B-9391-43A8-A722-BDD6F6115137}" > +EndProject > +Global > + GlobalSection(SolutionConfigurationPlatforms) = preSolution > + Debug|x64 = Debug|x64 > + Release|x64 = Release|x64 > + EndGlobalSection > + GlobalSection(ProjectConfigurationPlatforms) = postSolution > + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.ActiveCfg = Debug|x64 > + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Build.0 = Debug|x64 > + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Deploy.0 = Debug|x64 > + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.ActiveCfg = Release|x64 > + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Build.0 = Release|x64 > + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Deploy.0 = Release|x64 > + EndGlobalSection > + GlobalSection(SolutionProperties) = preSolution > + HideSolutionNode = FALSE > + EndGlobalSection > + GlobalSection(ExtensibilityGlobals) = postSolution > + SolutionGuid = {845012FB-4471-4A12-A1C4-FF7E05C40E8E} > + EndGlobalSection > +EndGlobal > diff --git a/windows/virt2phys/virt2phys.vcxproj b/windows/virt2phys/virt2phys.vcxproj > index fa51916..69af150 100644 > --- a/windows/virt2phys/virt2phys.vcxproj > +++ b/windows/virt2phys/virt2phys.vcxproj > @@ -1,228 +1,228 @@ > - > - > - > - > - Debug > - Win32 > - > - > - Release > - Win32 > - > - > - Debug > - x64 > - > - > - Release > - x64 > - > - > - Debug > - ARM > - > - > - Release > - ARM > - > - > - Debug > - ARM64 > - > - > - Release > - ARM64 > - > - > - > - > - > - > - > - > - > - > - > - > - {0EEF826B-9391-43A8-A722-BDD6F6115137} > - {497e31cb-056b-4f31-abb8-447fd55ee5a5} > - v4.5 > - 12.0 > - Debug > - Win32 > - virt2phys > - > - > - > - Windows10 > - true > - WindowsKernelModeDriver10.0 > - Driver > - KMDF > - Universal > - > - > - Windows10 > - false > - WindowsKernelModeDriver10.0 > - Driver > - KMDF > - Universal > - > - > - Windows10 > - true > - WindowsKernelModeDriver10.0 > - Driver > - KMDF > - Universal > - > - > - Windows10 > - false > - WindowsKernelModeDriver10.0 > - Driver > - KMDF > - Universal > - > - > - Windows10 > - true > - WindowsKernelModeDriver10.0 > - Driver > - KMDF > - Universal > - > - > - Windows10 > - false > - WindowsKernelModeDriver10.0 > - Driver > - KMDF > - Universal > - > - > - Windows10 > - true > - WindowsKernelModeDriver10.0 > - Driver > - KMDF > - Universal > - > - > - Windows10 > - false > - WindowsKernelModeDriver10.0 > - Driver > - KMDF > - Universal > - > - > - > - > - > - > - > - > - > - > - DbgengKernelDebugger > - > - > - DbgengKernelDebugger > - > - > - DbgengKernelDebugger > - > - > - DbgengKernelDebugger > - > - > - DbgengKernelDebugger > - > - > - DbgengKernelDebugger > - > - > - DbgengKernelDebugger > - > - > - DbgengKernelDebugger > - > - > - > - true > - true > - trace.h > - true > - > - > - > - > - true > - true > - trace.h > - true > - > - > - > - > - false > - true > - trace.h > - true > - > - > - $(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) > - > - > - 0.1 > - > - > - > - > - true > - true > - trace.h > - true > - > - > - > - > - true > - true > - trace.h > - true > - > - > - > - > - true > - true > - trace.h > - true > - > - > - > - > - true > - true > - trace.h > - true > - > - > - > - > - true > - true > - trace.h > - true > - > - > - > - > - > - > - > - > + > + > + > + > + Debug > + Win32 > + > + > + Release > + Win32 > + > + > + Debug > + x64 > + > + > + Release > + x64 > + > + > + Debug > + ARM > + > + > + Release > + ARM > + > + > + Debug > + ARM64 > + > + > + Release > + ARM64 > + > + > + > + > + > + > + > + > + > + > + > + > + {0EEF826B-9391-43A8-A722-BDD6F6115137} > + {497e31cb-056b-4f31-abb8-447fd55ee5a5} > + v4.5 > + 12.0 > + Debug > + Win32 > + virt2phys > + > + > + > + Windows10 > + true > + WindowsKernelModeDriver10.0 > + Driver > + KMDF > + Universal > + > + > + Windows10 > + false > + WindowsKernelModeDriver10.0 > + Driver > + KMDF > + Universal > + > + > + Windows10 > + true > + WindowsKernelModeDriver10.0 > + Driver > + KMDF > + Universal > + > + > + Windows10 > + false > + WindowsKernelModeDriver10.0 > + Driver > + KMDF > + Universal > + > + > + Windows10 > + true > + WindowsKernelModeDriver10.0 > + Driver > + KMDF > + Universal > + > + > + Windows10 > + false > + WindowsKernelModeDriver10.0 > + Driver > + KMDF > + Universal > + > + > + Windows10 > + true > + WindowsKernelModeDriver10.0 > + Driver > + KMDF > + Universal > + > + > + Windows10 > + false > + WindowsKernelModeDriver10.0 > + Driver > + KMDF > + Universal > + > + > + > + > + > + > + > + > + > + > + DbgengKernelDebugger > + > + > + DbgengKernelDebugger > + > + > + DbgengKernelDebugger > + > + > + DbgengKernelDebugger > + > + > + DbgengKernelDebugger > + > + > + DbgengKernelDebugger > + > + > + DbgengKernelDebugger > + > + > + DbgengKernelDebugger > + > + > + > + true > + true > + trace.h > + true > + > + > + > + > + true > + true > + trace.h > + true > + > + > + > + > + false > + true > + trace.h > + true > + > + > + $(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) > + > + > + 0.1 > + > + > + > + > + true > + true > + trace.h > + true > + > + > + > + > + true > + true > + trace.h > + true > + > + > + > + > + true > + true > + trace.h > + true > + > + > + > + > + true > + true > + trace.h > + true > + > + > + > + > + true > + true > + trace.h > + true > + > + > + > + > + > + > + > + > > \ No newline at end of file > -- > 2.28.0