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 A81E3A04B5; Thu, 29 Oct 2020 23:55:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 041B6CB3E; Thu, 29 Oct 2020 23:55:18 +0100 (CET) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by dpdk.org (Postfix) with ESMTP id A4E4ECB27 for ; Thu, 29 Oct 2020 23:55:16 +0100 (CET) Received: by mail-lf1-f44.google.com with SMTP id y184so3486804lfa.12 for ; Thu, 29 Oct 2020 15:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+bXlZwsfTcyoSBCJN4f7bqjh/2xSXHLfENk6wMLbgMY=; b=YPidtEH529IpQT0LQTCSwpSqXzx7G6JHjfivG7p4hTVLEP4ks9dQyl+c60LApVHp8Y UPB9KXgvNRptBx97sV9LanqxQD6UNPpCtysOQEWn9KojDWgcDgDlZ/ndgCftP5NmGPOa HlHxkctKucWYZT6EHTb6y5ot4YykTBN4kcp8H40H5JSshLhPVV9Ih6JQcYRqDjlMfhr4 oA5T28ZeYEs7Vd6JFmOiIVWMzeOQ+2XJl7ihuBHvhem5YdiGSagYHD3SrKPu/HUkiB7m pz+VFSVZXzG+PzANPGD1Mq9Pd1JEzEaTv5GPDF9ixt7UHlpIfvmLKvn6h63+8LRasksM 90gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+bXlZwsfTcyoSBCJN4f7bqjh/2xSXHLfENk6wMLbgMY=; b=JBZxiAP0gjZNVeg6rCO9ZgudQfY6xQGvGVTlWcLCvpWTkE6z710B8S33aOfDWk+X2i wPcWVOr2M4aKmNDnfTF/XWFM//PCYrwuYrV39kF54uoaFDyNr57o18gcGJr3DKWAFKnl mC+BM3zAWxk4ME8lWhSum1LCd9s0zCaugHUsg6Q/6nElBnmI6jbiS4GY5EMwKDs7Ccap PJI3IoscD5VwK6ImTcwIy8FrO/sf4JoFSQVXWf3zz65tOoRQ53rmAvE6QaeqfSnODrdG bX8Gw/ewTkYf0C4YGJ/NgVTLyk5zll/7HmPXpjBK7oOCKKruezRmxCs5UAmNdZN1PD6Z YSjg== X-Gm-Message-State: AOAM533u7zSOFz0iibKKvR4HsP1E6lf3dxrf5NkViTngInZnrrVm+FTS y5soAxivksToBmXhTuKrD8evlF77vH7Tbw== X-Google-Smtp-Source: ABdhPJyheEO7hE1uLRFrnOrwnWNO72dxczkYEij6mKB4o2BHazfejav9nYKT0g0lbGPbo+mi0fW8LA== X-Received: by 2002:a19:671c:: with SMTP id b28mr2321497lfc.40.1604012113112; Thu, 29 Oct 2020 15:55:13 -0700 (PDT) Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id k205sm384772lfk.270.2020.10.29.15.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 15:55:12 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Luca Boccassi , Narcisa Ana Maria Vasile , Dmitry Kozlyuk , John Alexander Date: Fri, 30 Oct 2020 01:55:05 +0300 Message-Id: <20201029225505.30093-1-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [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" 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=3D 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 u= pstream project if possible, otherwise to host kernel code in dpdk-kmods.git. =20 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 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=3Dauto - -*.sln text eol=3Dcrlf -*.vcxproj text eol=3Dcrlf 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 @@ -=EF=BB=BF=0D -Microsoft Visual Studio Solution File, Format Version 12.00=0D -# Visual Studio Version 16=0D -VisualStudioVersion =3D 16.0.29613.14=0D -MinimumVisualStudioVersion =3D 10.0.40219.1=0D -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "virt2phys", "virt2p= hys.vcxproj", "{0EEF826B-9391-43A8-A722-BDD6F6115137}"=0D -EndProject=0D -Global=0D - GlobalSection(SolutionConfigurationPlatforms) =3D preSolution=0D - Debug|x64 =3D Debug|x64=0D - Release|x64 =3D Release|x64=0D - EndGlobalSection=0D - GlobalSection(ProjectConfigurationPlatforms) =3D postSolution=0D - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.ActiveCfg =3D Debug|x64= =0D - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Build.0 =3D Debug|x64=0D - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Deploy.0 =3D Debug|x64= =0D - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.ActiveCfg =3D Release= |x64=0D - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Build.0 =3D Release|x= 64=0D - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Deploy.0 =3D Release|= x64=0D - EndGlobalSection=0D - GlobalSection(SolutionProperties) =3D preSolution=0D - HideSolutionNode =3D FALSE=0D - EndGlobalSection=0D - GlobalSection(ExtensibilityGlobals) =3D postSolution=0D - SolutionGuid =3D {845012FB-4471-4A12-A1C4-FF7E05C40E8E}=0D - EndGlobalSection=0D -EndGlobal=0D +=EF=BB=BF +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion =3D 16.0.29613.14 +MinimumVisualStudioVersion =3D 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "virt2phys", "virt2p= hys.vcxproj", "{0EEF826B-9391-43A8-A722-BDD6F6115137}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) =3D preSolution + Debug|x64 =3D Debug|x64 + Release|x64 =3D Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) =3D postSolution + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.ActiveCfg =3D Debug|x64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Build.0 =3D Debug|x64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Deploy.0 =3D Debug|x64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.ActiveCfg =3D Release= |x64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Build.0 =3D Release|x= 64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Deploy.0 =3D Release|= x64 + EndGlobalSection + GlobalSection(SolutionProperties) =3D preSolution + HideSolutionNode =3D FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) =3D postSolution + SolutionGuid =3D {845012FB-4471-4A12-A1C4-FF7E05C40E8E} + EndGlobalSection +EndGlobal diff --git a/windows/virt2phys/virt2phys.vcxproj b/windows/virt2phys/virt2p= hys.vcxproj index fa51916..69af150 100644 --- a/windows/virt2phys/virt2phys.vcxproj +++ b/windows/virt2phys/virt2phys.vcxproj @@ -1,228 +1,228 @@ -=EF=BB=BF=0D -=0D - =0D - =0D - Debug=0D - Win32=0D - =0D - =0D - Release=0D - Win32=0D - =0D - =0D - Debug=0D - x64=0D - =0D - =0D - Release=0D - x64=0D - =0D - =0D - Debug=0D - ARM=0D - =0D - =0D - Release=0D - ARM=0D - =0D - =0D - Debug=0D - ARM64=0D - =0D - =0D - Release=0D - ARM64=0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - {0EEF826B-9391-43A8-A722-BDD6F6115137}=0D - {497e31cb-056b-4f31-abb8-447fd55ee5a5}=0D - v4.5=0D - 12.0=0D - Debug=0D - Win32=0D - virt2phys=0D - =0D - =0D - =0D - Windows10=0D - true=0D - WindowsKernelModeDriver10.0=0D - Driver=0D - KMDF=0D - Universal=0D - =0D - =0D - Windows10=0D - false=0D - WindowsKernelModeDriver10.0=0D - Driver=0D - KMDF=0D - Universal=0D - =0D - =0D - Windows10=0D - true=0D - WindowsKernelModeDriver10.0=0D - Driver=0D - KMDF=0D - Universal=0D - =0D - =0D - Windows10=0D - false=0D - WindowsKernelModeDriver10.0=0D - Driver=0D - KMDF=0D - Universal=0D - =0D - =0D - Windows10=0D - true=0D - WindowsKernelModeDriver10.0=0D - Driver=0D - KMDF=0D - Universal=0D - =0D - =0D - Windows10=0D - false=0D - WindowsKernelModeDriver10.0=0D - Driver=0D - KMDF=0D - Universal=0D - =0D - =0D - Windows10=0D - true=0D - WindowsKernelModeDriver10.0=0D - Driver=0D - KMDF=0D - Universal=0D - =0D - =0D - Windows10=0D - false=0D - WindowsKernelModeDriver10.0=0D - Driver=0D - KMDF=0D - Universal=0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - DbgengKernelDebugger=0D - =0D - =0D - DbgengKernelDebugger=0D - =0D - =0D - DbgengKernelDebugger=0D - =0D - =0D - DbgengKernelDebugger=0D - =0D - =0D - DbgengKernelDebugger=0D - =0D - =0D - DbgengKernelDebugger=0D - =0D - =0D - DbgengKernelDebugger=0D - =0D - =0D - DbgengKernelDebugger=0D - =0D - =0D - =0D - true=0D - true=0D - trace.h=0D - true=0D - =0D - =0D - =0D - =0D - true=0D - true=0D - trace.h=0D - true=0D - =0D - =0D - =0D - =0D - false=0D - true=0D - trace.h=0D - true=0D - =0D - =0D - $(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDepend= encies)=0D - =0D - =0D - 0.1=0D - =0D - =0D - =0D - =0D - true=0D - true=0D - trace.h=0D - true=0D - =0D - =0D - =0D - =0D - true=0D - true=0D - trace.h=0D - true=0D - =0D - =0D - =0D - =0D - true=0D - true=0D - trace.h=0D - true=0D - =0D - =0D - =0D - =0D - true=0D - true=0D - trace.h=0D - true=0D - =0D - =0D - =0D - =0D - true=0D - true=0D - trace.h=0D - true=0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D - =0D +=EF=BB=BF + + + + 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;%(AdditionalDepend= encies) + + + 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 --=20 2.28.0