Skip to contentSkip to conversation

windows: normalize line-endings

PATCH In review Dmitry Kozlyuk 5 participants 19 messages Oct 29, 2020 – Nov 13, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 windows: normalize line-endings

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.

---
 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
README +5 -0
index e71dbba..0aaf58e 100644
@@ -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
windows/.gitattributes deleted +0 -4
deleted file mode 100644
index 13482db..0000000
@@ -1,4 +0,0 @@
-* text=auto
-
-*.sln text eol=crlf
-*.vcxproj text eol=crlf
windows/virt2phys/virt2phys.sln +27 -27

54 lines not on this page · raw message

windows/virt2phys/virt2phys.vcxproj +227 -227

456 lines not on this page · raw message

Signature · 1 line
2.28.0
#1 lore raw
Quoted 25 lines · Dmitry Kozlyuk

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.

---
 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
README +0 -0
index e71dbba..0aaf58e 100644

README Now the preference is to contribute kernel modules to the upstream project · line 15

Quoted 8 lines
README +5 -0
@@ -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.

Quoted 532 lines
windows/.gitattributes deleted +0 -4
deleted file mode 100644
index 13482db..0000000
@@ -1,4 +0,0 @@
-* text=auto
-
-*.sln text eol=crlf
-*.vcxproj text eol=crlf
windows/virt2phys/virt2phys.sln +27 -27
index 0f5ecdc..ea4eec4 100644
@@ -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
windows/virt2phys/virt2phys.vcxproj +227 -227
index fa51916..69af150 100644
@@ -1,228 +1,228 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="virt2phys.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="virt2phys.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Inf Include="virt2phys.inf" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0EEF826B-9391-43A8-A722-BDD6F6115137}</ProjectGuid>
-    <TemplateGuid>{497e31cb-056b-4f31-abb8-447fd55ee5a5}</TemplateGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <Configuration>Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <RootNamespace>virt2phys</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <WppKernelMode>true</WppKernelMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <WppKernelMode>true</WppKernelMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WppEnabled>false</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <WppKernelMode>true</WppKernelMode>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Inf>
-      <TimeStamp>0.1</TimeStamp>
-    </Inf>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <WppKernelMode>true</WppKernelMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <WppKernelMode>true</WppKernelMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <WppKernelMode>true</WppKernelMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <WppKernelMode>true</WppKernelMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <WppKernelMode>true</WppKernelMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <FilesToPackage Include="$(TargetPath)" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="virt2phys.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="virt2phys.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Inf Include="virt2phys.inf" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0EEF826B-9391-43A8-A722-BDD6F6115137}</ProjectGuid>
+    <TemplateGuid>{497e31cb-056b-4f31-abb8-447fd55ee5a5}</TemplateGuid>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <Configuration>Debug</Configuration>
+    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
+    <RootNamespace>virt2phys</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WppEnabled>true</WppEnabled>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
+      <WppKernelMode>true</WppKernelMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WppEnabled>true</WppEnabled>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
+      <WppKernelMode>true</WppKernelMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WppEnabled>false</WppEnabled>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
+      <WppKernelMode>true</WppKernelMode>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Inf>
+      <TimeStamp>0.1</TimeStamp>
+    </Inf>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WppEnabled>true</WppEnabled>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
+      <WppKernelMode>true</WppKernelMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <WppEnabled>true</WppEnabled>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
+      <WppKernelMode>true</WppKernelMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <WppEnabled>true</WppEnabled>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
+      <WppKernelMode>true</WppKernelMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WppEnabled>true</WppEnabled>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
+      <WppKernelMode>true</WppKernelMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WppEnabled>true</WppEnabled>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
+      <WppKernelMode>true</WppKernelMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <FilesToPackage Include="$(TargetPath)" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
Signature · 1 line
2.28.0
#2 lore raw

Hi Naty,

Quoted 2 lines

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?

The "input" option is for Unix devs only.

Quoted 3 lines

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.

AFAIK, you don't need to. Whatever you settings were when committing netuio, it now checks out with CRLF on Windows (core.autocrlf=true, installer default) and with LF on Linux (core.autocrlf=input, although unset also works). I'd wait for confirmation from Luca, though.

Acked-by
#3 lore raw
Quoted 7 lines · Dmitry Kozlyuk

Hi Naty,

Quoted 2 lines

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?

The "input" option is for Unix devs only.

Quoted 8 lines
Quoted 3 lines

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.

AFAIK, you don't need to. Whatever you settings were when committing netuio, it now checks out with CRLF on Windows (core.autocrlf=true, installer default) and with LF on Linux (core.autocrlf=input, although unset also works). I'd wait for confirmation from Luca, though.

Hi,

Thank you for looking into this. Yes the netuio folder is ok as-is:

$ dos2unix -id windows/netuio/netuio.vcxproj* windows/netuio/netuio.sln
       0  windows/netuio/netuio.vcxproj
       0  windows/netuio/netuio.vcxproj.filters
       0  windows/netuio/netuio.sln

The patch looks good to me, as I really need all files to be checked in with LF only as a hard requirement before I can upload to Debian/Ubuntu, so:

Does the change also stop future check-ins of CRLF files?

Signature · 2 lines
Kind regards,
Luca Boccassi
#4 lore raw
Quoted 26 lines · Luca Boccassi
Quoted 7 lines · Dmitry Kozlyuk

Hi Naty,

Quoted 2 lines

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?

The "input" option is for Unix devs only.

Quoted 8 lines
Quoted 3 lines

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.

AFAIK, you don't need to. Whatever you settings were when committing netuio, it now checks out with CRLF on Windows (core.autocrlf=true, installer default) and with LF on Linux (core.autocrlf=input, although unset also works). I'd wait for confirmation from Luca, though.

Hi,

Thank you for looking into this. Yes the netuio folder is ok as-is:

$ dos2unix -id windows/netuio/netuio.vcxproj* windows/netuio/netuio.sln
       0  windows/netuio/netuio.vcxproj
       0  windows/netuio/netuio.vcxproj.filters
       0  windows/netuio/netuio.sln
Quoted 7 lines

The patch looks good to me, as I really need all files to be checked in with LF only as a hard requirement before I can upload to Debian/Ubuntu, so:

Does the change also stop future check-ins of CRLF files?

Thomas pointed out that this patch still doesn't fix everything, there's still a few CLRF around. I must have applied by mistake on a branch where I was working on, with manual fixes, sorry for the confusion.

Eg, with this patch applied, the diff of dos2unix is still not empty:

$ dos2unix windows/virt2phys/*
dos2unix: converting file windows/virt2phys/virt2phys.c to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.h to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.inf to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.sln to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.vcxproj to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.vcxproj.filters
to Unix format...
$ git status
HEAD detached from origin/main
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   windows/virt2phys/virt2phys.sln
	modified:   windows/virt2phys/virt2phys.vcxproj
	modified:   windows/virt2phys/virt2phys.vcxproj.filters

Could you please send a v2 with a run of dos2unix on _all_ the files?

This is a blocker for me, I cannot upload 20.11 to Debian and Ubuntu until I have the kmods package ready, and I cannot upload this package until this issue is fixed.

Signature · 2 lines
Kind regards,
Luca Boccassi
#5 lore raw
In reply to Luca Boccassi
Quoted 7 lines · Luca Boccassi

The patch looks good to me, as I really need all files to be checked in with LF only as a hard requirement before I can upload to Debian/Ubuntu, so:

Does the change also stop future check-ins of CRLF files?

Yes. Regardless of core.autocrlf setting on Windows machine, where files with CRLF are created, they're checked-in with LF and checked-out with LF on Linux. Sorry for the late reply.

Acked-by on v1 1/1
#6 lore raw
In reply to Dmitry Kozlyuk
Quoted 12 lines · Dmitry Kozlyuk

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.

Quoted 8 lines
---
 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
#7 lore raw
In reply to Dmitry Kozlyuk

29/10/2020 23:55, Dmitry Kozlyuk:

Quoted 9 lines

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.

It is converted to what?
You mean all files should have LF endings in the repo?

[...]

Quoted 3 lines
 windows/virt2phys/virt2phys.sln     |  54 ++--
 windows/virt2phys/virt2phys.vcxproj | 454 ++++++++++++++--------------
 4 files changed, 259 insertions(+), 258 deletions(-)

The file windows/virt2phys/virt2phys.vcxproj.filters is not converted. And I see other stuff to fix, see below.

Quoted 1 line

+Some Windows files use have to use CRLF line-endings.

"use have to use" -> "have to use" ?

Isn't it automatic to have CRLF on Windows git working tree?

Review

Quoted 3 lines
(quoted diff) +3 -0
+Unix developers can configure git to get only LF on checkout:
+
+    git config core.autocrlf input

Isn't it the default?
If all files have LF, there is nothing to do on Unix.

I think more fixes are required as below:

windows/netuio/netuio.sln +0 -1
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
windows/netuio/netuio.vcxproj +2 -2
index 87c8b94..f01bf2a 100644
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -110,4 +110,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
windows/netuio/netuio.vcxproj.filters +2 -2
index 49c1da1..43536ce 100644
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -51,4 +51,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
windows/virt2phys/virt2phys.sln +0 -1
index ea4eec4..02dc38d 100644
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29613.14
windows/virt2phys/virt2phys.vcxproj +2 -2
index 69af150..c86cc9b 100644
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -225,4 +225,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
#8 lore raw
Quoted 36 lines · Thomas Monjalon

29/10/2020 23:55, Dmitry Kozlyuk:

Quoted 9 lines

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.

It is converted to what?
You mean all files should have LF endings in the repo?

[...]

Quoted 3 lines
 windows/virt2phys/virt2phys.sln     |  54 ++--
 windows/virt2phys/virt2phys.vcxproj | 454 ++++++++++++++--------------
 4 files changed, 259 insertions(+), 258 deletions(-)

The file windows/virt2phys/virt2phys.vcxproj.filters is not converted. And I see other stuff to fix, see below.

Quoted 1 line

+Some Windows files use have to use CRLF line-endings.

"use have to use" -> "have to use" ?

Isn't it automatic to have CRLF on Windows git working tree?

Review

Quoted 3 lines
(quoted diff) +3 -0
+Unix developers can configure git to get only LF on checkout:
+
+    git config core.autocrlf input

Isn't it the default?
If all files have LF, there is nothing to do on Unix.

Quoted 1 line

I think more fixes are required as below:

<..>

Yes, I second that - those changes are needed too.

Signature · 2 lines
Kind regards,
Luca Boccassi
#9 lore raw
Quoted 37 lines · Luca Boccassi
Quoted 36 lines · Thomas Monjalon

29/10/2020 23:55, Dmitry Kozlyuk:

Quoted 9 lines

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.

It is converted to what?
You mean all files should have LF endings in the repo?

[...]

Quoted 3 lines
 windows/virt2phys/virt2phys.sln     |  54 ++--
 windows/virt2phys/virt2phys.vcxproj | 454 ++++++++++++++--------------
 4 files changed, 259 insertions(+), 258 deletions(-)

The file windows/virt2phys/virt2phys.vcxproj.filters is not converted. And I see other stuff to fix, see below.

Quoted 1 line

+Some Windows files use have to use CRLF line-endings.

"use have to use" -> "have to use" ?

Isn't it automatic to have CRLF on Windows git working tree?

Review

Quoted 3 lines
(quoted diff) +3 -0
+Unix developers can configure git to get only LF on checkout:
+
+    git config core.autocrlf input

Isn't it the default?
If all files have LF, there is nothing to do on Unix.

Quoted 5 lines
Quoted 1 line

I think more fixes are required as below:

<..>

Yes, I second that - those changes are needed too.

To clarify, having some options that convert after the fact (clone/checkout) is _not_ a solution - everything needs to be checked in with LF endings only, otherwise automated infrastructure (where setting random configs it's just not an option) will break.

Signature · 2 lines
Kind regards,
Luca Boccassi
#10 lore raw
Quoted 40 lines · Luca Boccassi
Quoted 39 lines · Luca Boccassi
Quoted 37 lines · Thomas Monjalon

29/10/2020 23:55, Dmitry Kozlyuk:

Quoted 9 lines

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.

It is converted to what?
You mean all files should have LF endings in the repo?

[...]

Quoted 3 lines
 windows/virt2phys/virt2phys.sln     |  54 ++--
 windows/virt2phys/virt2phys.vcxproj | 454 ++++++++++++++--------------
 4 files changed, 259 insertions(+), 258 deletions(-)

The file windows/virt2phys/virt2phys.vcxproj.filters is not converted. And I see other stuff to fix, see below.

Quoted 1 line

+Some Windows files use have to use CRLF line-endings.

"use have to use" -> "have to use" ?

Isn't it automatic to have CRLF on Windows git working tree?

Review

Quoted 3 lines
(quoted diff) +3 -0
+Unix developers can configure git to get only LF on checkout:
+
+    git config core.autocrlf input

Isn't it the default?
If all files have LF, there is nothing to do on Unix.

I think more fixes are required as below:

Quoted 8 lines
Quoted 3 lines

<..>

Yes, I second that - those changes are needed too.

To clarify, having some options that convert after the fact (clone/checkout) is _not_ a solution - everything needs to be checked in with LF endings only, otherwise automated infrastructure (where setting random configs it's just not an option) will break.

Took the initiative and sent a v2 that changes all the files.

Signature · 2 lines
Kind regards,
Luca Boccassi
#11 lore raw

PATCH v2 1/1 windows: normalize line-endings

In reply to Dmitry Kozlyuk

From: Dmitry Kozlyuk <[email protected]>

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.

---
v2 from Luca: run dos2unix on all files in windows/virt2phys folder

 README                                      |   5 +
 windows/.gitattributes                      |   4 -
 windows/virt2phys/virt2phys.sln             |  54 +--
 windows/virt2phys/virt2phys.vcxproj         | 454 ++++++++++----------
 windows/virt2phys/virt2phys.vcxproj.filters |  72 ++--
 5 files changed, 295 insertions(+), 294 deletions(-)
 delete mode 100644 windows/.gitattributes
README +5 -0
index e71dbba..0aaf58e 100644
@@ -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
windows/.gitattributes deleted +0 -4
deleted file mode 100644
index 13482db..0000000
@@ -1,4 +0,0 @@
-* text=auto
-
-*.sln text eol=crlf
-*.vcxproj text eol=crlf
windows/virt2phys/virt2phys.sln +27 -27

54 lines not on this page · raw message

windows/virt2phys/virt2phys.vcxproj +227 -227

456 lines not on this page · raw message

windows/virt2phys/virt2phys.vcxproj.filters +36 -36

72 lines not on this page · raw message

Signature · 1 line
2.27.0
#12 lore raw

12/11/2020 21:15, [email protected]:

Quoted 17 lines

From: Dmitry Kozlyuk <[email protected]>

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.

---
v2 from Luca: run dos2unix on all files in windows/virt2phys folder

[...]

README Now the preference is to contribute kernel modules to the upstream project · line 15

Quoted 4 lines
README +4 -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

This is the same as in v1:
- same typo "use have to use"
- this config is probably useless

#13 lore raw
In reply to [email protected]

Hi Luca,

Thank you for taking the initiative. However, the patch fails to apply on my system, and that's the reason I've been delaying my own):

$ git am \[kmods\ PATCH\ v2\]\ windows:\ normalize\ line-endings 
Applying: windows: normalize line-endings
error: windows/virt2phys/virt2phys.sln: does not match index
error: windows/virt2phys/virt2phys.vcxproj: does not match index
error: patch failed: windows/virt2phys/virt2phys.vcxproj.filters:1
error: windows/virt2phys/virt2phys.vcxproj.filters: patch does not apply
Patch failed at 0001 windows: normalize line-endings

As far as I understand, this is caused by removed BOM: it exists in the repo, so it is included in the patch, but it's absent from checked-out files, so the patch fails to apply. Either there is some git option we're missing or only committer (i.e. Thomas) can do the conversion. It is correct to remove BOM. Note that \No newline at end of file will be restored by Visual Studio on save.

#14 lore raw

13/11/2020 08:06, Dmitry Kozlyuk:

Quoted 13 lines

Hi Luca,

Thank you for taking the initiative. However, the patch fails to apply on my system, and that's the reason I've been delaying my own):

$ git am \[kmods\ PATCH\ v2\]\ windows:\ normalize\ line-endings 
Applying: windows: normalize line-endings
error: windows/virt2phys/virt2phys.sln: does not match index
error: windows/virt2phys/virt2phys.vcxproj: does not match index
error: patch failed: windows/virt2phys/virt2phys.vcxproj.filters:1
error: windows/virt2phys/virt2phys.vcxproj.filters: patch does not apply
Patch failed at 0001 windows: normalize line-endings
Quoted 6 lines

As far as I understand, this is caused by removed BOM: it exists in the repo, so it is included in the patch, but it's absent from checked-out files, so the patch fails to apply. Either there is some git option we're missing or only committer (i.e. Thomas) can do the conversion. It is correct to remove BOM. Note that \No newline at end of file will be restored by Visual Studio on save.

What is BOM?

#15 lore raw
Quoted 14 lines · Thomas Monjalon

13/11/2020 08:06, Dmitry Kozlyuk:

Quoted 13 lines

Hi Luca,

Thank you for taking the initiative. However, the patch fails to apply on my system, and that's the reason I've been delaying my own):

$ git am \[kmods\ PATCH\ v2\]\ windows:\ normalize\ line-endings 
Applying: windows: normalize line-endings
error: windows/virt2phys/virt2phys.sln: does not match index
error: windows/virt2phys/virt2phys.vcxproj: does not match index
error: patch failed: windows/virt2phys/virt2phys.vcxproj.filters:1
error: windows/virt2phys/virt2phys.vcxproj.filters: patch does not apply
Patch failed at 0001 windows: normalize line-endings
Quoted 8 lines
Quoted 6 lines

As far as I understand, this is caused by removed BOM: it exists in the repo, so it is included in the patch, but it's absent from checked-out files, so the patch fails to apply. Either there is some git option we're missing or only committer (i.e. Thomas) can do the conversion. It is correct to remove BOM. Note that \No newline at end of file will be restored by Visual Studio on save.

What is BOM?

Last try: I split the patch, and first the gitattributes file is removed. I believe that's what stops the patch from being applicable. Also removed the bit in the README.

Thomas, I think if v3 is still not enough and there's still a dos2unix diff, then it means we can't do this change via patches, but it has to be done directly on your repo and pushed.

Signature · 2 lines
Kind regards,
Luca Boccassi
#16 lore raw

PATCH v3 1/2 windows: remove .gitattributes

In reply to Dmitry Kozlyuk

From: Luca Boccassi <[email protected]>

It forces files line ending conversions, making applying patches impossible. Remove it. Line endings will be normalized in the next patch.

---
v3: split the patch, and remove first the gitattributes, making it
possible to apply the second patch that normalizes

 windows/.gitattributes | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 windows/.gitattributes
windows/.gitattributes deleted +0 -4
deleted file mode 100644
index 13482db..0000000
@@ -1,4 +0,0 @@
-* text=auto
-
-*.sln text eol=crlf
-*.vcxproj text eol=crlf
Signature · 1 line
2.27.0
#17 lore raw

PATCH v3 2/2 windows: normalize line-endings

From: Luca Boccassi <[email protected]>

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.

---
v3: patch split, and README change removed

 windows/virt2phys/virt2phys.sln             |  54 +--
 windows/virt2phys/virt2phys.vcxproj         | 454 ++++++++++----------
 windows/virt2phys/virt2phys.vcxproj.filters |  72 ++--
 3 files changed, 290 insertions(+), 290 deletions(-)
windows/virt2phys/virt2phys.sln +27 -27
index 0f5ecdc..ae95c7b 100644
@@ -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
windows/virt2phys/virt2phys.vcxproj +227 -227

456 lines not on this page · raw message

windows/virt2phys/virt2phys.vcxproj.filters +36 -36

72 lines not on this page · raw message

Signature · 1 line
2.27.0
#18 lore raw

13/11/2020 10:50, [email protected]:

Quoted 7 lines

From: Luca Boccassi <[email protected]>

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.

Quoted 5 lines

---
v3: patch split, and README change removed

Such patch looks impossible to merge without manual operations. Applied, thanks